Changeset 4422


Ignore:
Timestamp:
Jan 2, 2004, 9:04:22 PM (17 years ago)
Author:
fkr
Message:

Bug:
Submitted by:
Reviewed by:
Approved by: jkh@
Obtained from:

as discussed on darwinports@, filedir should be (for consistency) be filesdir

Location:
trunk/base
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/doc/portfile.7

    r4399 r4422  
    170170.Sy Default:
    171171.Em ${workpath}/${worksrcdir}
    172 .It Ic filedir
     172.It Ic filesdir
    173173Path to port files relative to ${portpath}
    174174.br
  • trunk/base/src/port1.0/portmain.tcl

    r3954 r4422  
    4242options prefix name version revision epoch categories maintainers
    4343options long_description description homepage
    44 options workdir worksrcdir filedir distname portdbpath libpath distpath sources_conf os.platform os.version os.arch os.endian platforms default_variants
     44options workdir worksrcdir filedir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.arch os.endian platforms default_variants
    4545
    4646# Export options via PortInfo
     
    6161# destroot is provided as a clearer name for the "destpath" variable
    6262default destroot {${destpath}}
    63 default filedir files
     63default filesdir files
    6464default revision 0
    6565default epoch 0
    6666default distname {${portname}-${portversion}}
    6767default worksrcdir {$distname}
    68 default filesdir {files}
    6968default filespath {[file join $portpath $filesdir]}
    7069default worksrcpath {[file join $workpath $worksrcdir]}
     
    9089if {[info exists os.arch] && ![info exists variations(${os.arch})]} { variant_set ${os.arch} }
    9190
     91# deprecate options here
     92option_deprecate filedir filesdir
     93
    9294proc main {args} {
    9395    return 0
  • trunk/base/src/port1.0/portutil.tcl

    r4413 r4422  
    481481# Provides searching of the standard path for included files
    482482proc filefindbypath {fname} {
    483     global distpath filedir workdir worksrcdir portpath
     483    global distpath filesdir workdir worksrcdir portpath
    484484
    485485    if {[file readable $portpath/$fname]} {
    486486        return $portpath/$fname
    487     } elseif {[file readable $portpath/$filedir/$fname]} {
    488         return $portpath/$filedir/$fname
     487    } elseif {[file readable $portpath/$filesdir/$fname]} {
     488        return $portpath/$filesdir/$fname
    489489    } elseif {[file readable $distpath/$fname]} {
    490490        return $distpath/$fname
Note: See TracChangeset for help on using the changeset viewer.