The distribution patch under work/nbitools-R6.3/config/md.patch breaks

with GNU patch, hurting !NetBSD pkgsrc platforms. Replace the patch with
patch-a{m,n,o}, and remove the pre-patch target.

The pkglint
ERROR: Makefile:24: Invalid tool syntax: "${IMAKE_TOOLS:Nimake}".
appears to be bogus, given an identical expression is used in
<mk/tools/imake.mk>.

5 files changed, 83 insertions, 6 deletions

diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile
index f7698692cce..ea3b40e1df7 100644
--- a/devel/nbitools/Makefile
+++ b/devel/nbitools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2009/09/11 18:47:55 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2010/11/25 15:17:50 hauke Exp $
 #
 
 DISTNAME=	nbitools-R6.3
 PKGNAME=	nbitools-6.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -32,7 +32,4 @@ SUBST_SED.nbi=		-e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|'
 post-extract:
 	${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf
 
-pre-patch:
-	cd ${WRKSRC}/config/makedepend; ${PATCH} --quiet < md.patch
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo
index 077d680547d..73c7ade5314 100644
--- a/devel/nbitools/distinfo
+++ b/devel/nbitools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2006/07/05 04:59:47 jlam Exp $
+$NetBSD: distinfo,v 1.11 2010/11/25 15:17:50 hauke Exp $
 
 SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a
 RMD160 (nbitools-R6.3.tar.gz) = 047f64b113a0307b045573bfe429b59063ae38ea
@@ -15,3 +15,6 @@ SHA1 (patch-ai) = 9085fda5360c672865561e2c0aeafdc34596eb66
 SHA1 (patch-aj) = b3ec58e0fcbed869e230e0e3fa8b37517ed1b52e
 SHA1 (patch-ak) = 293f304c8e4dcafd2dd0f344c322df9fae9ff4a2
 SHA1 (patch-al) = d3f31eb2594560b75508fac223680fb9a01fe35c
+SHA1 (patch-am) = 24784762135c22786e805c90d2c86b0df83b9115
+SHA1 (patch-an) = 12997783591a61c3c547b1bcfc1fb248ea5b800b
+SHA1 (patch-ao) = 86fdd0f788a992ff51871613e459b18cefb1946e
diff --git a/devel/nbitools/patches/patch-am b/devel/nbitools/patches/patch-am
new file mode 100644
index 00000000000..72a296c752e
--- /dev/null
+++ b/devel/nbitools/patches/patch-am
@@ -0,0 +1,23 @@
+$NetBSD: patch-am,v 1.1 2010/11/25 15:17:51 hauke Exp $
+
+One of the three patches replacing the distribution patch
+under work/nbitools-R6.3/config/md.patch
+
+--- config/makedepend/def.h.orig	1997-08-22 08:21:35.000000000 +0000
++++ config/makedepend/def.h
+@@ -1,5 +1,6 @@
+ /* $XConsortium: def.h /main/30 1996/12/04 10:11:12 swick $ */
+ /* $XFree86: xc/config/makedepend/def.h,v 3.3 1997/01/12 10:38:17 dawes Exp $ */
++
+ /*
+ 
+ Copyright (c) 1993, 1994  X Consortium
+@@ -137,7 +138,7 @@ char			*realloc();
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*mdgetline();
+ struct symtab		**slookup();
+ struct symtab		**isdefined();
+ struct symtab		**fdefined();
diff --git a/devel/nbitools/patches/patch-an b/devel/nbitools/patches/patch-an
new file mode 100644
index 00000000000..ab0812a5412
--- /dev/null
+++ b/devel/nbitools/patches/patch-an
@@ -0,0 +1,23 @@
+$NetBSD: patch-an,v 1.1 2010/11/25 15:17:51 hauke Exp $
+
+One of the three patches replacing the distribution patch
+under work/nbitools-R6.3/config/md.patch
+
+--- config/makedepend/main.c.orig	1997-08-22 08:21:36.000000000 +0000
++++ config/makedepend/main.c
+@@ -1,5 +1,6 @@
+ /* $XConsortium: main.c /main/84 1996/12/04 10:11:23 swick $ */
+ /* $XFree86: xc/config/makedepend/main.c,v 3.11.2.1 1997/05/11 05:04:07 dawes Exp $ */
++
+ /*
+ 
+ Copyright (c) 1993, 1994  X Consortium
+@@ -548,7 +549,7 @@ match(str, list)
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *mdgetline(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
diff --git a/devel/nbitools/patches/patch-ao b/devel/nbitools/patches/patch-ao
new file mode 100644
index 00000000000..448617ffe6f
--- /dev/null
+++ b/devel/nbitools/patches/patch-ao
@@ -0,0 +1,31 @@
+$NetBSD: patch-ao,v 1.1 2010/11/25 15:17:51 hauke Exp $
+
+One of the three patches replacing the distribution patch
+under work/nbitools-R6.3/config/md.patch
+
+--- config/makedepend/parse.c.orig	1997-08-22 08:21:37.000000000 +0000
++++ config/makedepend/parse.c
+@@ -1,4 +1,5 @@
+ /* $XConsortium: parse.c /main/33 1996/12/04 10:11:28 swick $ */
++
+ /*
+ 
+ Copyright (c) 1993, 1994  X Consortium
+@@ -40,7 +41,7 @@ gobble(filep, file, file_red)
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while (line = getline(filep)) {
++	while (line = mdgetline(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
+ 		case IF:
+ 		case IFFALSE:
+@@ -529,7 +530,7 @@ find_includes(filep, file, file_red, rec
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while (line = getline(filep)) {
++	while (line = mdgetline(filep)) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
+ 		case IF:
+ 		doif: