Ticket #29707: extract.patch

base/src/port1.0/portfetch.tcl

@@ -120 +120 @@
 default global_mirror_site "macports_distfiles"
 default mirror_sites.listfile {"mirror_sites.tcl"}
 default mirror_sites.listpath {"port1.0/fetch"}
+default extract.cmd {[findBinary gzip ${portutil::autoconf::gzip_path}]}
+default extract.pre_args -dc
+default extract.post_args {"| ${portutil::autoconf::tar_command} -xf -"}
 
 # Deprecation
 option_deprecate svn.tag svn.revision
@@ -135 +138 @@
 option_proc fetch.type portfetch::set_fetch_type
 
 proc portfetch::set_extract_type {option action args} {
-    global extract.suffix
+    global extract.suffix extract.cmd extract.pre_args extract.post_args
     if {[string equal ${action} "set"] && [tbool args]} {
         switch $option {
             use_bzip2 {
                 set extract.suffix .tar.bz2
+                set extract.cmd [findBinary bzip2 ${portutil::autoconf::bzip2_path}]
             }
             use_lzma {
                 set extract.suffix .tar.lzma
+                set extract.cmd [binaryInPath "lzma"]
                 depends_extract-append bin:lzma:xz
             }
             use_xz {
                 set extract.suffix .tar.xz
+                set extract.cmd [binaryInPath "xz"]
                 depends_extract-append bin:xz:xz
             }
             use_zip {
                 set extract.suffix .zip
+                set extract.cmd [findBinary unzip ${portutil::autoconf::unzip_path}]
+                set extract.pre_args -q
+                set extract.post_args "-d ${extract.dir}"
                 depends_extract-append bin:unzip:unzip
             }
             use_7z {
                 set extract.suffix .7z
+                set extract.cmd [binaryInPath "7za"]
+                set extract.pre_args x
+                set extract.post_args ""
                 depends_extract-append bin:7za:p7zip
             }
             use_dmg {
                 set extract.suffix .dmg
+                global distname 
+                set dmg_mount [mkdtemp "/tmp/mports.XXXXXXXX"]
+                set extract.cmd [findBinary hdiutil ${portutil::autoconf::hdiutil_path}]
+                set extract.pre_args attach
+                set extract.post_args "-private -readonly -nobrowse -mountpoint \\\"${dmg_mount}\\\" && [findBinary cp ${portutil::autoconf::cp_path}] -Rp \\\"${dmg_mount}\\\" \\\"${extract.dir}/${distname}\\\" && ${extract.cmd} detach \\\"${dmg_mount}\\\" && [findBinary rmdir ${portutil::autoconf::rmdir_path}] \\\"${dmg_mount}\\\""
             }
         }
     }

base/src/port1.0/portextract.tcl

@@ -53 +53 @@
 default extract.only {[portextract::disttagclean $distfiles]}
 
 default extract.dir {${workpath}}
-default extract.cmd {[findBinary gzip ${portutil::autoconf::gzip_path}]}
-default extract.pre_args -dc
-default extract.post_args {"| ${portutil::autoconf::tar_command} -xf -"}
 default extract.mkdir no
 
 set_ui_prefix