Changeset 219 for trunk/base

Timestamp:

Aug 21, 2002, 6:25:49 AM (22 years ago)

Author:

landonf (Landon Fuller)

Message:

Support dist_subdir

Location:

trunk/base/src/port1.0

Files:

• portfetch.tcl (modified) (1 diff)
• portmain.tcl (modified) (4 diffs)

trunk/base/src/port1.0/portfetch.tcl

@@ -13 +13 @@
 
 # define options: distname master_sites
-options master_sites patch_sites extract_sufx distfiles extract_only patchfiles dist_subdir use_zip use_bzip2
+options master_sites patch_sites extract_sufx distfiles extract_only patchfiles use_zip use_bzip2
 
 proc suffix {distname} {

trunk/base/src/port1.0/portmain.tcl

@@ -13 +13 @@
 register com.apple.main provides main
 
+# define options
+options portname portversion portrevision categories maintainers workdir worksrcdir no_worksubdir filedir distname sysportpath libpath dist_subdir distpath
+
 # XXX Special case sysportpath. This variable is set by the bootstrap
 # and may not exist
@@ -18 +21 @@
         default distpath $sysportpath/distfiles
 }
+
 default prefix /usr/local/
 default workdir work
@@ -25 +29 @@
 default os_version $tcl_platform(osVersion)
 
-# define options
-options portname portversion portrevision categories maintainers workdir worksrcdir no_worksubdir filedir distname sysportpath libpath
-
 proc main {args} {
-    global worksrcdir main_opts portname distname
+    global worksrcdir main_opts portname distname distpath dist_subdir
 
     if {[tbool no_worksubdir]} {
@@ -38 +39 @@
         }
     }
+    if {[info exists distpath] && [info exists dist_subdir]} {
+        puts hello
+        set distpath ${distpath}/${dist_subdir}
+    }
+
     return 0
 }