Ticket #55471: macports.tcl.diff

File macports.tcl.diff, 1.9 KB (added by ryandesign (Ryan Carsten Schmidt), 7 years ago)
  • src/macports1.0/macports.tcl

    old new proc mportsync {{optionslist {}}} { 
    24952495    set obsoletesvn 0
    24962496
    24972497    ui_msg "$macports::ui_prefix Updating the ports tree"
     2498    if {${macports::os_platform} eq "darwin" &&
     2499        ((${macports::os_major} >= 13 && ${macports::cxx_stdlib} ne "libc++") ||
     2500        (${macports::os_major} < 13 && ${macports::cxx_stdlib} ne "libstdc++"))} {
     2501        set platindex_cxxlib "_[string map {+ x} ${macports::cxx_stdlib}]"
     2502    } else {
     2503        set platindex_cxxlib {}
     2504    }
     2505    set platindex "PortIndex_${macports::os_platform}_${macports::os_major}${platindex_cxxlib}_${macports::os_arch}/PortIndex"
    24982506    foreach source $sources {
    24992507        set flags [lrange $source 1 end]
    25002508        set source [lindex $source 0]
    proc mportsync {{optionslist {}}} { 
    26222630                    } else {
    26232631                        set index_source $source
    26242632                    }
    2625                     set remote_indexfile "${index_source}PortIndex_${macports::os_platform}_${macports::os_major}_${macports::os_arch}/PortIndex"
     2633                    set remote_indexfile "$index_source$platindex"
    26262634                    set rsync_commandline "$macports::autoconf::rsync_path $rsync_options $remote_indexfile $destdir"
    26272635                    try -pass_signal {
    26282636                        system $rsync_commandline
    proc mportsync {{optionslist {}}} { 
    27312739                    ui_warn "Setting world read permissions on parts of the ports tree failed, need root?"
    27322740                }
    27332741
    2734                 set platindex "PortIndex_${macports::os_platform}_${macports::os_major}_${macports::os_arch}/PortIndex"
    27352742                if {[file isfile ${destdir}/$platindex] && [file isfile ${destdir}/${platindex}.quick]} {
    27362743                    file rename -force ${destdir}/$platindex ${destdir}/${platindex}.quick $destdir
    27372744                }