Changeset 118563


Ignore:
Timestamp:
Apr 4, 2014, 11:04:25 PM (5 years ago)
Author:
cal@…
Message:

base: remove all references to macports_tcl_dir from macports1.0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/macports1.0/macports.tcl

    r118562 r118563  
    4242    namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities port_phases
    4343    variable bootstrap_options "\
    44         portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat \
     44        portdbpath binpath auto_path extra_env sources_conf prefix portdbformat \
    4545        portarchivetype portautoclean \
    4646        porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \
     
    556556        macports::sources_default \
    557557        macports::destroot_umask \
    558         macports::libpath \
    559558        macports::prefix \
    560559        macports::macportsuser \
     
    876875    if {![file isdirectory $portsharepath]} {
    877876        return -code error "Data files directory '$portsharepath' must exist"
    878     }
    879 
    880     if {![info exists libpath]} {
    881         set libpath ${prefix}/share/macports/Tcl
    882877    }
    883878
     
    33773372# selfupdate procedure
    33783373proc macports::selfupdate {{optionslist {}} {updatestatusvar {}}} {
    3379     global macports::prefix macports::portdbpath macports::libpath \
    3380            macports::rsync_server macports::rsync_dir macports::rsync_options \
    3381            macports::autoconf::macports_version macports::autoconf::rsync_path \
    3382            tcl_platform macports::autoconf::openssl_path macports::autoconf::tar_path
     3374    global macports::prefix macports::portdbpath macports::rsync_server macports::rsync_dir \
     3375           macports::rsync_options macports::autoconf::macports_version \
     3376           macports::autoconf::rsync_path tcl_platform macports::autoconf::openssl_path \
     3377           macports::autoconf::tar_path
    33833378    array set options $optionslist
    33843379
     
    35053500            ui_debug "Permissions OK"
    35063501
    3507             # where to install a link to our macports1.0 tcl package
    3508             set mp_tclpackage_path [file join $portdbpath .tclpackage]
    3509             if {[file exists $mp_tclpackage_path]} {
    3510                 set fd [open $mp_tclpackage_path r]
    3511                 gets $fd tclpackage
    3512                 close $fd
    3513             } else {
    3514                 set tclpackage $libpath
    3515             }
    3516 
    3517             set configure_args "--prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
     3502            set configure_args "--prefix=$prefix --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
    35183503            # too many users have an incompatible readline in /usr/local, see ticket #10651
    35193504            if {$tcl_platform(os) ne {Darwin} || $prefix eq {/usr/local}
     
    35353520
    35363521            # do the actual configure, build and installation of new base
    3537             ui_msg "Installing new MacPorts release in $prefix as ${owner}:${group}; permissions ${perms}; Tcl-Package in $tclpackage\n"
     3522            ui_msg "Installing new MacPorts release in $prefix as ${owner}:${group}; permissions ${perms}\n"
    35383523            if {[catch {system "cd $mp_source_path && ${cc_arg}./configure $configure_args && make SELFUPDATING=1 && make install SELFUPDATING=1"} result]} {
    35393524                return -code error "Error installing new MacPorts base: $result"
Note: See TracChangeset for help on using the changeset viewer.