Ticket #4074: tbz-archive.patch

doc/ports.conf.in

@@ -34 +34 @@
 # Unarchive uses multiple types as a search list to locate the archive,
 # first archive to match one of the specified types in order is used.
 #
-# Supported types: tgz (default), tar, xar, zip, cpgz , cpio
+# Supported types: tgz (default), tar, tbz, xar, zip, cpgz , cpio
 portarchivetype                tgz
 
 # Set whether to automatically execute "clean" after "install" of ports

src/package1.0/portarchive.tcl

@@ -168 +168 @@
                                 return -code error "No '$pax' was found on this system!"
                         }
                 }
-                t(ar|gz) {
+                t(ar|bz|gz) {
                         set tar "tar"
                         if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
                                 ui_debug "Using $tar"
                                 set archive.cmd "$tar"
                                 set archive.pre_args {-cvf}
                                 if {[regexp {z$} ${archive.type}]} {
-                                        set gzip "gzip"
+                                        if {[regexp {bz$} ${archive.type}]} {
+                                                set gzip "bzip2"
+                                        } else {
+                                                set gzip "gzip"
+                                        }
                                         if {[catch {set gzip [binaryInPath $gzip]} errmsg] == 0} {
                                                 ui_debug "Using $gzip"
                                                 set archive.args {- .}

src/package1.0/portunarchive.tcl

@@ -187 +188 @@
                                 return -code error "No '$pax' was found on this system!"
                         }
                 }
-                t(ar|gz) {
+                t(ar|bz|gz) {
                         set tar "tar"
                         if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
                                 ui_debug "Using $tar"
@@ -195 +196 @@
                                 set unarchive.pre_args {-xvpf}
                                 if {[regexp {z$} ${unarchive.type}]} {
                                         set unarchive.args {-}
-                                        set gzip "gzip"
+                                        if {[regexp {bz$} ${unarchive.type}]} {
+                                                set gzip "bzip2"
+                                        } else {
+                                                set gzip "gzip"
+                                        }
                                         if {[catch {set gzip [binaryInPath $gzip]} errmsg] == 0} {
                                                 ui_debug "Using $gzip"
                                                 set unarchive.env "$gzip -d -c ${unarchive.path} |"

src/port1.0/portutil.tcl

@@ -1218 +1218 @@
                                 }
                         }
                 }
-                t(ar|gz) {
+                t(ar|bz|gz) {
                         set tar "tar"
                         if {[catch {set tar [binaryInPath $tar]} errmsg] == 0} {
                                 if {[regexp {z$} $type]} {
-                                        set gzip "gzip"
+                                        if {[regexp {bz$} $type]} {
+                                                set gzip "bzip2"
+                                        } else {
+                                                set gzip "gzip"
+                                        }
                                         if {[catch {set gzip [binaryInPath $gzip]} errmsg] == 0} {
                                                 return 0
                                         }