Changeset 953 for trunk/base

Timestamp:

Oct 5, 2002, 8:40:03 AM (22 years ago)

Author:

kevin

Message:

Changed extract_sufx to extract.sufx

Location:

trunk/base

Files:

• doc/exampleport/Portfile (modified) (2 diffs)
• doc/portfile.7 (modified) (4 diffs)
• src/port/port.1 (modified) (1 diff)
• src/port1.0/portfetch.tcl (modified) (5 diffs)

trunk/base/doc/exampleport/Portfile

@@ -25 +25 @@
 
 # (Optional) Explicitly set suffix (default: .tar.gz)
-#extract_sufx   .tar.bz2
+#extract.sufx   .tar.bz2
 
 # (Optional) Use bzip2 instead of gzip for uncompressing distribution file
@@ -33 +33 @@
 # <file name> <checksum type> <checksum>
 # Currently the only supported checksum type is md5
-checksums       ${distname}${extract_sufx} md5 45627db03b6cf89b8dabae6d815dcd9b
+checksums       ${distname}${extract.sufx} md5 45627db03b6cf89b8dabae6d815dcd9b
 
 # Any patches which should be applied after extracting this port.  These

trunk/base/doc/portfile.7

@@ -260 +260 @@
 .Dl patch_sites ftp://ftp.patchcityrepo.com/pub/magic/patches
 
-.It Ic extract_sufx
+.It Ic extract.sufx
 Suffix to append to ${distname}
 .br
@@ -269 +269 @@
 .br
 .Sy Example:
-.Dl extract_sufx        .tgz
+.Dl extract.sufx        .tgz
 
 .It Ic distfiles
@@ -294 +294 @@
 Use zip.
 .br
-Sets extract_sufx to: .zip
+Sets extract.sufx to: .zip
 .br
 Sets extract.cmd to: unzip
@@ -311 +311 @@
 Use bzip2.
 .br
-Sets extract_sufx to: .bzip2
+Sets extract.sufx to: .bzip2
 .br
 Sets extract.cmd to: bzip2

trunk/base/src/port/port.1

@@ -86 +86 @@
 The following demonstrates invoking
 .Nm
-with the "extract" target on portdir "textproc/figlet" and extract_sufx set to ".tgz":
+with the "extract" target on portdir "textproc/figlet" and extract.sufx set to ".tgz":
 .Pp
-.Dl "port extract -d textproc/figlet extract_sufx=.tgz"
+.Dl "port extract -d textproc/figlet extract.sufx=.tgz"
 .Pp
 .Sh DIAGNOSTICS

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

@@ -40 +40 @@
 
 # define options: distname master_sites
-options master_sites patch_sites extract_sufx distfiles patchfiles use_zip use_bzip2 dist_subdir fetch.type cvs.module cvs.root cvs.password cvs.tag
+options master_sites patch_sites extract.sufx distfiles patchfiles use_zip use_bzip2 dist_subdir fetch.type cvs.module cvs.root cvs.password cvs.tag
 # XXX we use the command framework to buy us some useful features,
 # but this is not a user-modifiable command
@@ -47 +47 @@
 
 # Defaults
-default extract_sufx .tar.gz
+default extract.sufx .tar.gz
 default fetch.type standard
 default cvs.cmd cvs
@@ -68 +68 @@
 namespace eval options { }
 proc options::use_bzip2 {args} {
-    global use_bzip2 extract_sufx
+    global use_bzip2 extract.sufx
     if [tbool use_bzip2] {
-        set extract_sufx .tar.bz2
+        set extract.sufx .tar.bz2
     }
 }
 
 proc options::use_zip {args} {
-    global use_zip extract_sufx
+    global use_zip extract.sufx
     if [tbool use_zip] {
-        set extract_sufx .zip
+        set extract.sufx .zip
     }
 }
@@ -87 +87 @@
 set UI_PREFIX "---> "
 
-# Given a distname, return a suffix based on the use_zip / use_bzip2 / extract_sufx options
+# Given a distname, return a suffix based on the use_zip / use_bzip2 / extract.sufx options
 proc suffix {distname} {
-    global extract_sufx use_bzip2 use_zip fetch.type
+    global extract.sufx use_bzip2 use_zip fetch.type
         if {"${fetch.type}" == "cvs"} {
         return ""
@@ -98 +98 @@
         return ${distname}.zip
     } else {
-        return ${distname}${extract_sufx}
+        return ${distname}${extract.sufx}
     }
 }