Changeset 1515


Ignore:
Timestamp:
Dec 24, 2002, 11:19:42 AM (18 years ago)
Author:
landonf (Landon Fuller)
Message:

Base portresourcepath off of install prefix, instead of per-port prefix

Location:
trunk/base/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/darwinports1.0/darwinports.tcl

    r1500 r1515  
    3434    namespace export bootstrap_options portinterp_options uniqid 0
    3535    variable bootstrap_options "portdbpath libpath auto_path sources_conf prefix"
    36     variable portinterp_options "portdbpath portpath auto_path prefix"
     36    variable portinterp_options "portdbpath portpath auto_path prefix portsharepath"
    3737    variable uniqid 0
    3838}
     
    6666
    6767proc dportinit {args} {
    68     global auto_path env darwinports::portdbpath darwinports::bootstrap_options darwinports::uniqid darwinports::portinterp_options darwinports::portconf darwinports::sources darwinports::sources_conf
     68    global auto_path env darwinports::portdbpath darwinports::bootstrap_options darwinports::uniqid darwinports::portinterp_options darwinports::portconf darwinports::sources darwinports::sources_conf darwinports::portsharepath
    6969
    7070    if {[llength [array names env HOME]] > 0} {
     
    125125        return -code error "$portdbpath is not a directory. Please create the directory $portdbpath and try again"
    126126    }
     127
     128    set portsharepath ${prefix}/share/darwinports
     129    if ![file isdirectory $portsharepath] {
     130        return -code error "Data files directory '$portsharepath' must exist"
     131    }
    127132   
    128133    if ![info exists libpath] {
     
    138143
    139144proc darwinports::worker_init {workername portpath options variations} {
    140     global darwinports::uniqid darwinports::portinterp_options darwinports::portdbpath darwinports::portconf auto_path
     145    global darwinports::uniqid darwinports::portinterp_options darwinports::portdbpath darwinports::portconf auto_path \
     146        darwinports::portsharepath darwinports::prefix
    141147    # Create package require abstraction procedure
    142148    $workername eval "proc PortSystem \{version\} \{ \n\
  • trunk/base/src/port1.0/portmain.tcl

    r1514 r1515  
    4949
    5050# Hard coded version number for resource location
    51 default portresourcepath {[file join $prefix share/darwinports/resources/port1.0]}
     51default portresourcepath {[file join $portsharepath resources/port1.0]}
    5252default distpath {[file join $portdbpath distfiles]}
    5353default workdir work
Note: See TracChangeset for help on using the changeset viewer.