From a3e3213cf56304669d475f9713d304d5cdbc328e Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 21 Apr 2009 21:26:13 +0000
Subject: 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.

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

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index b4bee30b54c..641e0e9c892 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -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 @@ TOOLS_PATH.openssl=		${TOOLS_PREFIX.openssl}/bin/openssl
 .  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
 
-- 
cgit v1.2.3