CVS commit: pkgsrc/mk/tools

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Jan 29 22:41:00 UTC 2019

Modified Files:
        pkgsrc/mk/tools: replace.mk

Log Message:
mk/tools/replace.mk: Update the check to devel/nbpatch

The check to avoid possible dependency loop was not updated to
check devel/nbpatch (instead of devel/patch).

Fix PR pkg/53920 reported by Dean Matzkov.


To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 pkgsrc/mk/tools/replace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.285 pkgsrc/mk/tools/replace.mk:1.286
--- pkgsrc/mk/tools/replace.mk:1.285    Wed Oct 17 08:22:19 2018
+++ pkgsrc/mk/tools/replace.mk  Tue Jan 29 22:41:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.285 2018/10/17 08:22:19 jperkin Exp $
+# $NetBSD: replace.mk,v 1.286 2019/01/29 22:41:00 leot Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -639,7 +639,7 @@ TOOLS_PATH.openssl=         ${LOCALBASE}/bin/op
 .endif
 
 .if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch)
-.  if !empty(PKGPATH:Mdevel/patch)
+.  if !empty(PKGPATH:Mdevel/nbpatch)
 MAKEFLAGS+=                    TOOLS_IGNORE.patch=
 .  elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
 TOOLS_DEPENDS.patch?=          nbpatch-[0-9]*:../../devel/nbpatch