<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118563] trunk/base/src/macports1.0/macports.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118563">118563</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-04-04 16:04:25 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: remove all references to macports_tcl_dir from macports1.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (118562 => 118563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2014-04-04 22:58:04 UTC (rev 118562)
+++ trunk/base/src/macports1.0/macports.tcl 2014-04-04 23:04:25 UTC (rev 118563)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> namespace eval macports {
</span><span class="cx"> namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities port_phases
</span><span class="cx"> variable bootstrap_options "\
</span><del>- portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat \
</del><ins>+ portdbpath binpath auto_path extra_env sources_conf prefix portdbformat \
</ins><span class="cx"> portarchivetype portautoclean \
</span><span class="cx"> porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \
</span><span class="cx"> rsync_dir startupitem_type startupitem_install place_worksymlink xcodeversion xcodebuildcmd \
</span><span class="lines">@@ -555,7 +555,6 @@
</span><span class="cx"> macports::sources \
</span><span class="cx"> macports::sources_default \
</span><span class="cx"> macports::destroot_umask \
</span><del>- macports::libpath \
</del><span class="cx"> macports::prefix \
</span><span class="cx"> macports::macportsuser \
</span><span class="cx"> macports::prefix_frozen \
</span><span class="lines">@@ -877,10 +876,6 @@
</span><span class="cx"> return -code error "Data files directory '$portsharepath' must exist"
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {![info exists libpath]} {
- set libpath ${prefix}/share/macports/Tcl
- }
-
</del><span class="cx"> if {![info exists binpath]} {
</span><span class="cx"> set env(PATH) ${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin
</span><span class="cx"> } else {
</span><span class="lines">@@ -3376,10 +3371,10 @@
</span><span class="cx">
</span><span class="cx"> # selfupdate procedure
</span><span class="cx"> proc macports::selfupdate {{optionslist {}} {updatestatusvar {}}} {
</span><del>- 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
</del><ins>+ global macports::prefix macports::portdbpath 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
</ins><span class="cx"> array set options $optionslist
</span><span class="cx">
</span><span class="cx"> # variable that indicates whether we actually updated base
</span><span class="lines">@@ -3504,17 +3499,7 @@
</span><span class="cx"> }
</span><span class="cx"> ui_debug "Permissions OK"
</span><span class="cx">
</span><del>- # where to install a link to our macports1.0 tcl package
- set mp_tclpackage_path [file join $portdbpath .tclpackage]
- if {[file exists $mp_tclpackage_path]} {
- set fd [open $mp_tclpackage_path r]
- gets $fd tclpackage
- close $fd
- } else {
- set tclpackage $libpath
- }
-
- set configure_args "--prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
</del><ins>+ set configure_args "--prefix=$prefix --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
</ins><span class="cx"> # too many users have an incompatible readline in /usr/local, see ticket #10651
</span><span class="cx"> if {$tcl_platform(os) ne {Darwin} || $prefix eq {/usr/local}
</span><span class="cx"> || ([glob -nocomplain /usr/local/lib/lib{readline,history}*] eq {} && [glob -nocomplain /usr/local/include/readline/*.h] eq {})} {
</span><span class="lines">@@ -3534,7 +3519,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # do the actual configure, build and installation of new base
</span><del>- ui_msg "Installing new MacPorts release in $prefix as ${owner}:${group}; permissions ${perms}; Tcl-Package in $tclpackage\n"
</del><ins>+ ui_msg "Installing new MacPorts release in $prefix as ${owner}:${group}; permissions ${perms}\n"
</ins><span class="cx"> if {[catch {system "cd $mp_source_path && ${cc_arg}./configure $configure_args && make SELFUPDATING=1 && make install SELFUPDATING=1"} result]} {
</span><span class="cx"> return -code error "Error installing new MacPorts base: $result"
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>