Thu Nov 25 15:17:51 2010 UTC ()
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>.


(hauke)
diff -r1.17 -r1.18 pkgsrc/devel/nbitools/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/nbitools/distinfo
diff -r0 -r1.1 pkgsrc/devel/nbitools/patches/patch-am
diff -r0 -r1.1 pkgsrc/devel/nbitools/patches/patch-an
diff -r0 -r1.1 pkgsrc/devel/nbitools/patches/patch-ao
cvs diff -r1.17 -r1.18 pkgsrc/devel/nbitools/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nbitools/Attic/Makefile 2009/09/11 18:47:55 1.17
+++ pkgsrc/devel/nbitools/Attic/Makefile 2010/11/25 15:17:50 1.18
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.17 2009/09/11 18:47:55 tnn Exp $ 1# $NetBSD: Makefile,v 1.18 2010/11/25 15:17:50 hauke Exp $
2# 2#
3 3
4DISTNAME= nbitools-R6.3 4DISTNAME= nbitools-R6.3
5PKGNAME= nbitools-6.3 5PKGNAME= nbitools-6.3
6PKGREVISION= 4 6PKGREVISION= 5
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_LOCAL} 8MASTER_SITES= ${MASTER_SITE_LOCAL}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.kitebird.com/imake-book/ 11HOMEPAGE= http://www.kitebird.com/imake-book/
12COMMENT= imake and tools derived from NetBSD-current/xsrc 12COMMENT= imake and tools derived from NetBSD-current/xsrc
13 13
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15PKG_DESTDIR_SUPPORT= destdir 15PKG_DESTDIR_SUPPORT= destdir
16NOT_FOR_UNPRIVILEGED= yes 16NOT_FOR_UNPRIVILEGED= yes
17 17
18BUILD_TARGET= World 18BUILD_TARGET= World
19MAKE_ENV+= GCCCMD=gcc 19MAKE_ENV+= GCCCMD=gcc
@@ -22,17 +22,14 @@ MAKE_JOBS_SAFE= NO @@ -22,17 +22,14 @@ MAKE_JOBS_SAFE= NO
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24USE_TOOLS+= ${IMAKE_TOOLS:Nimake} 24USE_TOOLS+= ${IMAKE_TOOLS:Nimake}
25 25
26SUBST_CLASSES+= nbi 26SUBST_CLASSES+= nbi
27SUBST_STAGE.nbi= pre-configure 27SUBST_STAGE.nbi= pre-configure
28SUBST_MESSAGE.nbi= Fixing definition of ProjectRoot. 28SUBST_MESSAGE.nbi= Fixing definition of ProjectRoot.
29SUBST_FILES.nbi= config/cf/site.def 29SUBST_FILES.nbi= config/cf/site.def
30SUBST_SED.nbi= -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|' 30SUBST_SED.nbi= -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|'
31 31
32post-extract: 32post-extract:
33 ${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf 33 ${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf
34 34
35pre-patch: 
36 cd ${WRKSRC}/config/makedepend; ${PATCH} --quiet < md.patch 
37 
38.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/devel/nbitools/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/nbitools/Attic/distinfo 2006/07/05 04:59:47 1.10
+++ pkgsrc/devel/nbitools/Attic/distinfo 2010/11/25 15:17:50 1.11
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1$NetBSD: distinfo,v 1.10 2006/07/05 04:59:47 jlam Exp $ 1$NetBSD: distinfo,v 1.11 2010/11/25 15:17:50 hauke Exp $
2 2
3SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a 3SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a
4RMD160 (nbitools-R6.3.tar.gz) = 047f64b113a0307b045573bfe429b59063ae38ea 4RMD160 (nbitools-R6.3.tar.gz) = 047f64b113a0307b045573bfe429b59063ae38ea
5Size (nbitools-R6.3.tar.gz) = 435764 bytes 5Size (nbitools-R6.3.tar.gz) = 435764 bytes
6SHA1 (patch-aa) = df66d326f0a5375f829353084bf9935ac2d8e57c 6SHA1 (patch-aa) = df66d326f0a5375f829353084bf9935ac2d8e57c
7SHA1 (patch-ab) = 4cc71d9e9a3c12106deff9d60118d363ae3ba981 7SHA1 (patch-ab) = 4cc71d9e9a3c12106deff9d60118d363ae3ba981
8SHA1 (patch-ac) = 443c407f7619a8592da4d833f9fba91d78bd0493 8SHA1 (patch-ac) = 443c407f7619a8592da4d833f9fba91d78bd0493
9SHA1 (patch-ad) = 4b6792ede85edcf9315a5f10e3a080db73e67a44 9SHA1 (patch-ad) = 4b6792ede85edcf9315a5f10e3a080db73e67a44
10SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550 10SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550
11SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6 11SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6
12SHA1 (patch-ag) = 2563b2e5105d000cc0b57717d4dadfadec34ee4f 12SHA1 (patch-ag) = 2563b2e5105d000cc0b57717d4dadfadec34ee4f
13SHA1 (patch-ah) = 10645ba6e875cca81c7cb67e570b737f16ccfa26 13SHA1 (patch-ah) = 10645ba6e875cca81c7cb67e570b737f16ccfa26
14SHA1 (patch-ai) = 9085fda5360c672865561e2c0aeafdc34596eb66 14SHA1 (patch-ai) = 9085fda5360c672865561e2c0aeafdc34596eb66
15SHA1 (patch-aj) = b3ec58e0fcbed869e230e0e3fa8b37517ed1b52e 15SHA1 (patch-aj) = b3ec58e0fcbed869e230e0e3fa8b37517ed1b52e
16SHA1 (patch-ak) = 293f304c8e4dcafd2dd0f344c322df9fae9ff4a2 16SHA1 (patch-ak) = 293f304c8e4dcafd2dd0f344c322df9fae9ff4a2
17SHA1 (patch-al) = d3f31eb2594560b75508fac223680fb9a01fe35c 17SHA1 (patch-al) = d3f31eb2594560b75508fac223680fb9a01fe35c
 18SHA1 (patch-am) = 24784762135c22786e805c90d2c86b0df83b9115
 19SHA1 (patch-an) = 12997783591a61c3c547b1bcfc1fb248ea5b800b
 20SHA1 (patch-ao) = 86fdd0f788a992ff51871613e459b18cefb1946e
File Added: pkgsrc/devel/nbitools/patches/Attic/patch-am
$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();
File Added: pkgsrc/devel/nbitools/patches/Attic/patch-an
$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 */
File Added: pkgsrc/devel/nbitools/patches/Attic/patch-ao
$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: