summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2003-11-22 23:47:47 +0000
committerjlam <jlam>2003-11-22 23:47:47 +0000
commit66463d6aebea2c85de1f1bcfdf48374321c155fe (patch)
tree6b71da41bb2e837a20ff29bd65db126b28717bf7
parent8e957139646c16517bf16100b8704b56d4a3b53e (diff)
downloadpkgsrc-66463d6aebea2c85de1f1bcfdf48374321c155fe.tar.gz
Add public variables EXTRACT_CMD_OPTS.{zip,lha,lhz,zoo} that may be set in
package Makefiles to customize the options passed to the extraction commands when the defaults don't suffice. Patch from Michal Pasternak with additions by me.
-rw-r--r--mk/bsd.pkg.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index f071384e65c..7c6806dacc1 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1303 2003/11/20 16:59:02 cube Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1304 2003/11/22 23:47:47 jlam Exp $
#
# This file is in the public domain.
#
@@ -2032,10 +2032,14 @@ EXTRACT_ELEMENTS?= # empty
DOWNLOADED_DISTFILE= $${extract_file}
-EXTRACT_CMD.zip?= ${LOCALBASE}/bin/unzip -Laqo $${extract_file}
-EXTRACT_CMD.lha?= ${LOCALBASE}/bin/lha xq $${extract_file}
+EXTRACT_CMD.zip?= ${LOCALBASE}/bin/unzip ${EXTRACT_CMD_OPTS.zip} $${extract_file}
+EXTRACT_CMD_OPTS.zip?= -Laqo
+EXTRACT_CMD.lha?= ${LOCALBASE}/bin/lha ${EXTRACT_CMD_OPTS.lha} $${extract_file}
+EXTRACT_CMD_OPTS.lha?= xq
EXTRACT_CMD.lzh?= ${EXTRACT_CMD.lha}
-EXTRACT_CMD.zoo?= ${LOCALBASE}/bin/unzoo -x $${extract_file}
+EXTRACT_CMD_OPTS.lzh?= ${EXTRACT_CMD_OPTS.lha}
+EXTRACT_CMD.zoo?= ${LOCALBASE}/bin/unzoo ${EXTRACT_CMD_OPTS.zoo} $${extract_file}
+EXTRACT_CMD_OPTS.zoo?= -x
.for __suffix__ in .gz .bz2 .Z
EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} > `${BASENAME} $${extract_file} ${__suffix__}`