[pkgsrc/trunk]: pkgsrc/mk/tools GNU xargs must be invoked with "-r" so that w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3cb543091b9c
branches:  trunk
changeset: 493344:3cb543091b9c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 03 17:14:14 2005 +0000

description:
GNU xargs must be invoked with "-r" so that we don't run the command at
all if the stdin is empty.

diffstat:

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

diffs (22 lines):

diff -r 8b19e4de7058 -r 3cb543091b9c mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue May 03 16:34:02 2005 +0000
+++ b/mk/tools/replace.mk       Tue May 03 17:14:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.59 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: replace.mk,v 1.60 2005/05/03 17:14:14 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -786,9 +786,10 @@
 MAKEFLAGS+=                    TOOLS_IGNORE.xargs=
 .  elif !empty(_TOOLS_USE_PKGSRC.xargs:M[yY][eE][sS])
 TOOLS_DEPENDS.xargs?=          findutils>=4.1:../../sysutils/findutils
-TOOLS_SYMLINK+=                        xargs
+TOOLS_WRAP+=                   xargs
 TOOLS_REAL_CMD.xargs=          ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}xargs
-${_TOOLS_VARNAME.xargs}=       ${TOOLS_REAL_CMD.xargs}
+TOOLS_ARGS.xargs=              -r      # don't run command if stdin is empty
+${_TOOLS_VARNAME.xargs}=       ${TOOLS_REAL_CMD.xargs} ${TOOLS_ARGS.xargs}
 .  endif
 .endif