From d95aeb4b3374eb1cfdafbfd3c88b5c7e6e340f74 Mon Sep 17 00:00:00 2001
From: Felix Kronlage <fkr@macports.org>
Date: Fri, 2 Jan 2004 21:04:22 +0000
Subject: [PATCH] Bug: Submitted by: Reviewed by: Approved by:   jkh@ Obtained
 from:

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

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@4422 d073be05-634f-4543-b044-5fe20cf6d1d6
---
 doc/portfile.7           | 2 +-
 src/port1.0/portmain.tcl | 8 +++++---
 src/port1.0/portutil.tcl | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/portfile.7 b/doc/portfile.7
index 0d73c95642..dfaa1715b0 100644
--- a/doc/portfile.7
+++ b/doc/portfile.7
@@ -169,7 +169,7 @@ Full path to working sources (where port has unpacked itself)
 .Em read-only
 .Sy Default:
 .Em ${workpath}/${worksrcdir}
-.It Ic filedir
+.It Ic filesdir
 Path to port files relative to ${portpath}
 .br
 .Sy Type:
diff --git a/src/port1.0/portmain.tcl b/src/port1.0/portmain.tcl
index 996e764db9..6020e396b3 100755
--- a/src/port1.0/portmain.tcl
+++ b/src/port1.0/portmain.tcl
@@ -41,7 +41,7 @@ target_provides ${com.apple.main} main
 # define options
 options prefix name version revision epoch categories maintainers
 options long_description description homepage
-options workdir worksrcdir filedir distname portdbpath libpath distpath sources_conf os.platform os.version os.arch os.endian platforms default_variants
+options workdir worksrcdir filedir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.arch os.endian platforms default_variants
 
 # Export options via PortInfo
 options_export name version revision epoch categories maintainers platforms description long_description homepage
@@ -60,12 +60,11 @@ default destdir destroot
 default destpath {${workpath}/${destdir}}
 # destroot is provided as a clearer name for the "destpath" variable
 default destroot {${destpath}}
-default filedir files
+default filesdir files
 default revision 0
 default epoch 0
 default distname {${portname}-${portversion}}
 default worksrcdir {$distname}
-default filesdir {files}
 default filespath {[file join $portpath $filesdir]}
 default worksrcpath {[file join $workpath $worksrcdir]}
 
@@ -89,6 +88,9 @@ default os.endian {[string range $tcl_platform(byteOrder) 0 [expr [string length
 if {[info exists os.platform] && ![info exists variations(${os.platform})]} { variant_set ${os.platform}}
 if {[info exists os.arch] && ![info exists variations(${os.arch})]} { variant_set ${os.arch} }
 
+# deprecate options here
+option_deprecate filedir filesdir
+
 proc main {args} {
     return 0
 }
diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
index 5bf8740195..c2113e47fb 100755
--- a/src/port1.0/portutil.tcl
+++ b/src/port1.0/portutil.tcl
@@ -480,12 +480,12 @@ proc reinplace {pattern args}  {
 # filefindbypath
 # Provides searching of the standard path for included files
 proc filefindbypath {fname} {
-    global distpath filedir workdir worksrcdir portpath
+    global distpath filesdir workdir worksrcdir portpath
 
     if {[file readable $portpath/$fname]} {
 	return $portpath/$fname
-    } elseif {[file readable $portpath/$filedir/$fname]} {
-	return $portpath/$filedir/$fname
+    } elseif {[file readable $portpath/$filesdir/$fname]} {
+	return $portpath/$filesdir/$fname
     } elseif {[file readable $distpath/$fname]} {
 	return $distpath/$fname
     }