summaryrefslogtreecommitdiff
path: root/mk/extract
diff options
context:
space:
mode:
authorjoerg <joerg>2008-05-25 20:02:02 +0000
committerjoerg <joerg>2008-05-25 20:02:02 +0000
commit0258ce21feadaee3f5db3bd22983804047d9d5f2 (patch)
tree0db38f70fdee00ce801444b5f5da8e707408f2af /mk/extract
parent2a47a6e8f6a922e2cb1f93e911ac1fc24df80dee (diff)
downloadpkgsrc-0258ce21feadaee3f5db3bd22983804047d9d5f2.tar.gz
Add support to extract using bsdtar.
Diffstat (limited to 'mk/extract')
-rw-r--r--mk/extract/bsd.extract-vars.mk6
-rw-r--r--mk/extract/extract.mk6
2 files changed, 8 insertions, 4 deletions
diff --git a/mk/extract/bsd.extract-vars.mk b/mk/extract/bsd.extract-vars.mk
index 0a2fa715061..adc3a00f33e 100644
--- a/mk/extract/bsd.extract-vars.mk
+++ b/mk/extract/bsd.extract-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.extract-vars.mk,v 1.9 2007/12/30 13:37:18 joerg Exp $
+# $NetBSD: bsd.extract-vars.mk,v 1.10 2008/05/25 20:02:02 joerg Exp $
#
# This Makefile fragment is included separately by bsd.pkg.mk and
# defines some variables which must be defined earlier than where
@@ -33,7 +33,9 @@ EXTRACT_SUFX?= .tar.gz
!empty(EXTRACT_ONLY:M*.tgz) || \
!empty(EXTRACT_ONLY:M*-tar.gz) || \
!empty(EXTRACT_ONLY:M*_tar.gz)
-. if !empty(EXTRACT_USING:Mgtar)
+. if !empty(EXTRACT_USING:Mbsdtar)
+USE_TOOLS+= bsdtar
+. elif !empty(EXTRACT_USING:Mgtar)
USE_TOOLS+= gtar
. elif !empty(EXTRACT_USING:Mnbtar)
USE_TOOLS+= tar
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk
index 175da698b34..4549435eb5b 100644
--- a/mk/extract/extract.mk
+++ b/mk/extract/extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.26 2008/03/12 15:51:39 jlam Exp $
+# $NetBSD: extract.mk,v 1.27 2008/05/25 20:02:02 joerg Exp $
#
# The following variables may be set by the package Makefile and
# specify how extraction happens:
@@ -177,7 +177,9 @@ _EXTRACT_ENV+= ${TOOLS_UNZIP_CMD:D UNZIP_CMD=${TOOLS_UNZIP_CMD:Q}}
_EXTRACT_ENV+= ${TOOLS_UNZOO:D UNZOO=${TOOLS_UNZOO:Q}}
_EXTRACT_ENV+= ${EXTRACT_ENV}
-.if !empty(EXTRACT_USING:Mgtar)
+.if !empty(EXTRACT_USING:Mbsdtar)
+_EXTRACT_TAR= ${TOOLS_PATH.bsdtar}
+.elif !empty(EXTRACT_USING:Mgtar)
_EXTRACT_TAR= ${TOOLS_PATH.gtar}
.elif !empty(EXTRACT_USING:Mnbtar)
_EXTRACT_TAR= ${TOOLS_TAR}