[pkgsrc/trunk]: pkgsrc/mk/tools Use nbpatch, not gpatch, when the platform is...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/069393a29101
branches:  trunk
changeset: 391909:069393a29101
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Apr 21 21:26:13 2009 +0000

description:
Use nbpatch, not gpatch, when the platform is missing it.
The former is known to have less issues like being able to deal with
asymmetric context and no line limits.

diffstat:

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

diffs (26 lines):

diff -r fc5b2c1921c7 -r 069393a29101 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Apr 21 18:58:17 2009 +0000
+++ b/mk/tools/replace.mk       Tue Apr 21 21:26:13 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.218 2009/02/05 18:44:43 joerg Exp $
+# $NetBSD: replace.mk,v 1.219 2009/04/21 21:26:13 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -642,12 +642,12 @@
 .  if !empty(PKGPATH:Mdevel/patch)
 MAKEFLAGS+=                    TOOLS_IGNORE.patch=
 .  elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
-TOOLS_DEPENDS.patch?=          patch>=2.2:../../devel/patch
+TOOLS_DEPENDS.patch?=          nbpatch-[0-9]*:../../devel/nbpatch
 TOOLS_CREATE+=                 patch
-TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.patch=patch
-TOOLS_PATH.patch=              ${TOOLS_PREFIX.patch}/bin/gpatch
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.patch=nbpatch
+TOOLS_PATH.patch=              ${TOOLS_PREFIX.patch}/bin/nbpatch
 _PATCH_CAN_BACKUP=             yes
-_PATCH_BACKUP_ARG?=            -b -V simple -z
+_PATCH_BACKUP_ARG?=            -V simple -z
 .  endif
 .endif