Ticket #15868: patch.diff

File patch.diff, 9.2 KB (added by blb@…, 16 years ago)

patch to remove various _path

  • src/port/port.tcl

     
    26392639
    26402640                    # Try to open a browser to the homepage for the given port
    26412641                    if { $homepage != "" } {
    2642                         system "${macports::autoconf::open_path} '$homepage'"
     2642                        system "open '$homepage'"
    26432643                    } else {
    26442644                        ui_error [format "No homepage for %s" $portname]
    26452645                    }
  • src/registry1.0/receipt_flat.tcl

     
    146146                set receipt_file [file join ${receipt_path} receipt]
    147147        }
    148148
    149         if { [file exists ${receipt_file}.bz2] && [file exists ${registry::autoconf::bzip2_path}] } {
     149        if { [file exists ${receipt_file}.bz2] } {
    150150                set receipt_file ${receipt_file}.bz2
    151                 set receipt_contents [exec ${registry::autoconf::bzip2_path} -d -c ${receipt_file}]
     151                set receipt_contents [exec bzip2 -d -c ${receipt_file}]
    152152        } elseif { [file exists ${receipt_file}] } {
    153153                set receipt_handle [open ${receipt_file} r]
    154154                set receipt_contents [read $receipt_handle]
     
    325325
    326326        system "mv ${receipt_file}.tmp ${receipt_file}"
    327327
    328         if { [file exists ${receipt_file}] && [file exists ${registry::autoconf::bzip2_path}] && ![info exists registry.nobzip] } {
    329                 system "${registry::autoconf::bzip2_path} -f ${receipt_file}"
     328        if { [file exists ${receipt_file}] && ![info exists registry.nobzip] } {
     329                system "bzip2 -f ${receipt_file}"
    330330        }
    331331
    332332        return 1
     
    527527
    528528        if { ![file exists ${map_file}.db] } {
    529529                # Convert to new format
    530                 if { [file exists ${map_file}.bz2] && [file exists ${registry::autoconf::bzip2_path}] } {
    531                         set old_filemap [exec ${registry::autoconf::bzip2_path} -d -c ${map_file}.bz2]
     530                if { [file exists ${map_file}.bz2] } {
     531                        set old_filemap [exec bzip2 -d -c ${map_file}.bz2]
    532532                } elseif { [file exists $map_file] } {         
    533533                        set map_handle [open ${map_file} r]
    534534                        set old_filemap [read $map_handle]
     
    703703
    704704        set map_file [file join ${receipt_path} dep_map]
    705705
    706         if { [file exists ${map_file}.bz2] && [file exists ${registry::autoconf::bzip2_path}] } {
    707                 set dep_map [exec ${registry::autoconf::bzip2_path} -d -c ${map_file}.bz2]
     706        if { [file exists ${map_file}.bz2] } {
     707                set dep_map [exec bzip2 -d -c ${map_file}.bz2]
    708708        } elseif { [file exists ${map_file}] } {
    709709                set map_handle [open ${map_file} r]
    710710                set dep_map [read $map_handle]
     
    806806
    807807    file rename ${map_file}.tmp ${map_file}
    808808
    809         if { [file exists ${map_file}] && [file exists ${registry::autoconf::bzip2_path}] && ![info exists registry.nobzip] } {
    810                 system "${registry::autoconf::bzip2_path} -f ${map_file}"
     809        if { [file exists ${map_file}] && ![info exists registry.nobzip] } {
     810                system "bzip2 -f ${map_file}"
    811811        }
    812812
    813813        return 1
  • src/registry1.0/registry_autoconf.tcl.in

     
    3131package provide registry 1.0
    3232
    3333namespace eval registry::autoconf {
    34     variable bzip2_path "@BZIP2@"
    3534}
  • src/port1.0/portfetch.tcl

     
    5858default extract.suffix .tar.gz
    5959default fetch.type standard
    6060
    61 default cvs.cmd {$portutil::autoconf::cvs_path}
     61default cvs.cmd {cvs}
    6262default cvs.password ""
    6363default cvs.dir {${workpath}}
    6464default cvs.method {export}
     
    7070default cvs.args ""
    7171default cvs.post_args {"${cvs.module}"}
    7272
    73 default svn.cmd {$portutil::autoconf::svn_path}
     73default svn.cmd {svn}
    7474default svn.dir {${workpath}}
    7575default svn.method {export}
    7676default svn.tag ""
     
    470470        set savecmd ${cvs.cmd}
    471471        set saveargs ${cvs.args}
    472472        set savepost_args ${cvs.post_args}
    473         set cvs.cmd "echo ${cvs.password} | $portutil::autoconf::cvs_path"
     473        set cvs.cmd "echo ${cvs.password} | cvs"
    474474        set cvs.args login
    475475        set cvs.post_args ""
    476476        if {[catch {command_exec cvs -notty "" "2>&1"} result]} {
     
    536536   
    537537    # Look for the git command
    538538    set git.cmd {}
    539     foreach gitcmd "$portutil::autoconf::git_path $prefix_frozen/bin/git git" {
     539    foreach gitcmd "$prefix_frozen/bin/git git" {
    540540        if {[file executable $gitcmd]} {
    541541            set git.cmd $gitcmd
    542542            break
  • src/port1.0/portdestroot.tcl

     
    9292    ui_msg "$UI_PREFIX [format [msgcat::mc "Staging %s into destroot"] ${portname}]"
    9393
    9494    set oldmask [umask ${destroot.umask}]
    95     set mtree ${portutil::autoconf::mtree_path}
    9695   
    9796    if { ${destroot.clean} == "yes" } {
    9897        system "rm -Rf \"${destroot}\""
     
    10099   
    101100    file mkdir "${destroot}"
    102101    if { ${os.platform} == "darwin" } {
    103         system "cd \"${destroot}\" && ${mtree} -e -U -f [file join ${portsharepath} install macosx.mtree]"
     102        system "cd \"${destroot}\" && mtree -e -U -f [file join ${portsharepath} install macosx.mtree]"
    104103        file mkdir "${destroot}/${applications_dir}"
    105104        file mkdir "${destroot}/${frameworks_dir}"
    106105    }
    107106    file mkdir "${destroot}/${prefix}"
    108     system "cd \"${destroot}/${prefix}\" && ${mtree} -e -U -f [file join ${portsharepath} install prefix.mtree]"
     107    system "cd \"${destroot}/${prefix}\" && mtree -e -U -f [file join ${portsharepath} install prefix.mtree]"
    109108}
  • src/port1.0/port_autoconf.tcl.in

     
     proc destroot_main {args} {
     
    3131package provide port 1.0
    3232
    3333namespace eval portutil::autoconf {
    34         variable cvs_path "@CVS@"
    35         variable svn_path "@SVN@"
    36         variable git_path "@GIT@"
    37         variable rsync_path "@RSYNC@"
    38         variable mtree_path "@MTREE@"
    39         variable xar_path "@XAR@"
    4034        variable sed_command "@SED@"
    4135        variable sed_ext_flag "@SED_EXT@"
    4236        variable tar_command "@TAR_CMD@"
  • src/macports1.0/macports.tcl

     
    14131413proc mportsync {{optionslist {}}} {
    14141414    global macports::sources macports::portdbpath macports::rsync_options tcl_platform
    14151415    global macports::portverbose
    1416     global macports::autoconf::rsync_path
    14171416    array set options $optionslist
    14181417
    14191418    set numfailed 0
     
    14311430            {^file$} {
    14321431                set portdir [macports::getportdir $source]
    14331432                if {[file exists $portdir/.svn]} {
    1434                     set svn_commandline "[macports::findBinary svn ${macports::autoconf::svn_path}] update --non-interactive ${portdir}"
     1433                    set svn_commandline "[macports::findBinary svn] update --non-interactive ${portdir}"
    14351434                    ui_debug $svn_commandline
    14361435                    if {
    14371436                        [catch {
     
    14641463                    set source "${source}/"
    14651464                }
    14661465                # Do rsync fetch
    1467                 set rsync_commandline "${macports::autoconf::rsync_path} ${rsync_options} ${source} ${destdir}"
     1466                set rsync_commandline "rsync ${rsync_options} ${source} ${destdir}"
    14681467                ui_debug $rsync_commandline
    14691468                if {[catch {system $rsync_commandline}]} {
    14701469                    ui_error "Synchronization of the local ports tree failed doing rsync"
     
    18101809# selfupdate procedure
    18111810proc macports::selfupdate {{optionslist {}}} {
    18121811    global macports::prefix macports::portdbpath macports::libpath macports::rsync_server macports::rsync_dir macports::rsync_options
    1813     global macports::autoconf::macports_version macports::autoconf::rsync_path
     1812    global macports::autoconf::macports_version
    18141813    array set options $optionslist
    18151814   
    18161815    # syncing ports tree.
     
    18291828   
    18301829    # sync the MacPorts sources
    18311830    ui_debug "Updating MacPorts sources using rsync"
    1832     if { [catch { system "$rsync_path $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_source_path" } result ] } {
     1831    if { [catch { system "rsync $rsync_options rsync://${rsync_server}/${rsync_dir} $mp_source_path" } result ] } {
    18331832       return -code error "Error synchronizing MacPorts sources: $result"
    18341833    }
    18351834
  • src/macports1.0/macports_autoconf.tcl.in

     
    3535    variable macports_conf_path "@MPCONFIGDIR_EXPANDED@"
    3636    variable macports_version "@MACPORTS_VERSION@"
    3737    variable macports_user_dir "~/.macports"
    38     variable svn_path "@SVN@"
    39     variable rsync_path "@RSYNC@"
    40     variable open_path "@OPEN@"
    4138}