pkg/31564: patch for .tbz2 support in pkgsrc

[ghen%telenet.be@localhost]

>Number:         31564
>Category:       pkg
>Synopsis:       patch for .tbz2 support in pkgsrc
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 12 09:30:02 +0000 2005
>Originator:     Geert Hendrickx
>Release:        
>Organization:
>Environment:
>Description:
pkgsrc supports common EXTRACT_SUFXes like ".tar.bz" and ".tbz", but apparently 
not ".tbz2".  A package I'm working on (XaraLX) uses .tbz2 so here's a patch to 
support it.  
>How-To-Repeat:
% make extract
===> Checking for vulnerabilities in XaraLX-0.1
=> Checksum SHA1 OK for XaraLX0.1.tbz2.
=> Checksum RMD160 OK for XaraLX0.1.tbz2.
work -> /cvs/work/ghen/xaralx-bin/work
===> Extracting for XaraLX-0.1
===> Required installed package suse_gtk2>=7.3: suse_gtk2-9.1nb3 found
/usr/share/distfiles//XaraLX0.1.tbz2: permission denied-xf: not found

*** Error code 127

Stop.
make: stopped in /cvs/pkgsrc/ghen/xaralx-bin
*** Error code 1

Stop.
make: stopped in /cvs/pkgsrc/ghen/xaralx-bin
>Fix:
--- mk/bsd.pkg.extract.mk.orig  2005-10-12 11:20:11.000000000 +0200
+++ mk/bsd.pkg.extract.mk       2005-10-12 11:23:08.000000000 +0200
@@ -40,7 +40,7 @@
 EXTRACT_SUFX?=         .tar.gz
 EXTRACT_USING?=                nbtar
 
-_EXTRACT_SUFFIXES=     .tar.gz .tgz .tar.bz2 .tbz .tar.Z .tar _tar.gz
+_EXTRACT_SUFFIXES=     .tar.gz .tgz .tar.bz2 .tbz .tbz2 .tar.Z .tar _tar.gz
 _EXTRACT_SUFFIXES+=    .shar.gz .shar.bz2 .shar.Z .shar
 _EXTRACT_SUFFIXES+=    .zip
 _EXTRACT_SUFFIXES+=    .lha .lzh
@@ -54,6 +54,7 @@
 .if !empty(_EXTRACT_PATTERNS:M*.tar) || \
     !empty(_EXTRACT_PATTERNS:M*.tar.*) || \
     !empty(_EXTRACT_PATTERNS:M*.tbz) || \
+    !empty(_EXTRACT_PATTERNS:M*.tbz2) || \
     !empty(_EXTRACT_PATTERNS:M*.tgz) || \
     !empty(_EXTRACT_PATTERNS:M*_tar.gz)
 
@@ -66,7 +67,8 @@
 .  endif
 .endif
 .if !empty(_EXTRACT_PATTERNS:M*.bz2) || \
-    !empty(_EXTRACT_PATTERNS:M*.tbz)
+    !empty(_EXTRACT_PATTERNS:M*.tbz) || \
+    !empty(_EXTRACT_PATTERNS:M*.tbz2)
 USE_TOOLS+=    bzcat
 .endif
 .if !empty(_EXTRACT_PATTERNS:M*.zip)
@@ -92,6 +94,7 @@
 DECOMPRESS_CMD.tgz?=           ${DECOMPRESS_CMD.tar.gz}
 DECOMPRESS_CMD.tar.bz2?=       ${BZCAT}
 DECOMPRESS_CMD.tbz?=           ${DECOMPRESS_CMD.tar.bz2}
+DECOMPRESS_CMD.tbz2?=          ${DECOMPRESS_CMD.tar.bz2}
 DECOMPRESS_CMD.tar.Z?=         ${GZCAT}
 DECOMPRESS_CMD.tar?=           ${CAT}