[pkgsrc/trunk]: pkgsrc/mk/tools When using the pkgsrc versions of gzip/gunzip...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e75b2ebba64d
branches:  trunk
changeset: 493332:e75b2ebba64d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 03 15:17:26 2005 +0000

description:
When using the pkgsrc versions of gzip/gunzip, also invoke them with
the same set of arguments that the system-supplied gzip/gunzip would
use.

diffstat:

 mk/tools/replace.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 607853f2cabc -r e75b2ebba64d mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue May 03 15:16:54 2005 +0000
+++ b/mk/tools/replace.mk       Tue May 03 15:17:26 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.57 2005/05/02 21:10:03 jlam Exp $
+# $NetBSD: replace.mk,v 1.58 2005/05/03 15:17:26 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -410,9 +410,10 @@
 MAKEFLAGS+=                    TOOLS_IGNORE.gunzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS])
 TOOLS_DEPENDS.gunzip?=         gzip-base>=1.2.4b:../../archivers/gzip-base
-TOOLS_SYMLINK+=                        gunzip
+TOOLS_WRAP+=                   gunzip
 TOOLS_REAL_CMD.gunzip=         ${LOCALBASE}/bin/gunzip
-${_TOOLS_VARNAME.gunzip}=      ${TOOLS_REAL_CMD.gunzip}
+TOOLS_ARGS.gunzip=             -f
+${_TOOLS_VARNAME.gunzip}=      ${TOOLS_REAL_CMD.gunzip} ${TOOLS_ARGS.gunzip}
 .  endif
 .endif
 
@@ -432,9 +433,10 @@
 MAKEFLAGS+=                    TOOLS_IGNORE.gzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
 TOOLS_DEPENDS.gzip?=           gzip-base>=1.2.4b:../../archivers/gzip-base
-TOOLS_SYMLINK+=                        gzip
+TOOLS_WRAP+=                   gzip
 TOOLS_REAL_CMD.gzip=           ${LOCALBASE}/bin/gzip
-${_TOOLS_VARNAME.gzip}=                ${TOOLS_REAL_CMD.gzip}
+TOOLS_ARGS.gzip=               -nf ${GZIP}
+${_TOOLS_VARNAME.gzip}=                ${TOOLS_REAL_CMD.gzip} ${TOOLS_ARGS.gzip}
 .  endif
 .endif