[pkgsrc/pkgsrc-2004Q4]: pkgsrc/devel/nbitools Pullup ticket 221 - requested b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a536e32ca78
branches:  pkgsrc-2004Q4
changeset: 485819:5a536e32ca78
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Jan 17 20:39:18 2005 +0000

description:
Pullup ticket 221 - requested by Min Sik Kim
build fix for nbitools

   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Dec 28 10:30:58 UTC 2004

   Modified Files:
          pkgsrc/devel/nbitools: distinfo
          pkgsrc/devel/nbitools/patches: patch-ag

   Log Message:
   Include sys/stat.h to use "struct stat" on Linux.

   To generate a diff of this commit:
   cvs rdiff -r1.3 -r1.4 pkgsrc/devel/nbitools/distinfo
   cvs rdiff -r1.1 -r1.2 pkgsrc/devel/nbitools/patches/patch-ag
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Thu Dec 30 00:04:56 UTC 2004

   Modified Files:
          pkgsrc/devel/nbitools: Makefile

   Log Message:
   Use GNU make on Linux because imake generates Makefile that requires
   GNU make.

   To generate a diff of this commit:
   cvs rdiff -r1.5 -r1.6 pkgsrc/devel/nbitools/Makefile

diffstat:

 devel/nbitools/Makefile         |   8 +++++++-
 devel/nbitools/distinfo         |   4 ++--
 devel/nbitools/patches/patch-ag |  10 +++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r 469c4e2f0497 -r 5a536e32ca78 devel/nbitools/Makefile
--- a/devel/nbitools/Makefile   Sat Jan 15 07:01:05 2005 +0000
+++ b/devel/nbitools/Makefile   Mon Jan 17 20:39:18 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/03 15:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2005/01/17 20:39:18 snj Exp $
 #
 
 DISTNAME=      nbitools-R6.3
@@ -18,6 +18,12 @@
 BUILD_TARGET=  World
 MAKE_ENV+=     GCCCMD=gcc
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+USE_GNU_TOOLS+=        make
+.endif
+
 post-patch:
        @${MV} ${WRKSRC}/config/cf/site.def ${WRKSRC}/config/cf/site.def.orig
        @${SED} -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|' \
diff -r 469c4e2f0497 -r 5a536e32ca78 devel/nbitools/distinfo
--- a/devel/nbitools/distinfo   Sat Jan 15 07:01:05 2005 +0000
+++ b/devel/nbitools/distinfo   Mon Jan 17 20:39:18 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/04/29 18:59:25 minskim Exp $
+$NetBSD: distinfo,v 1.3.6.1 2005/01/17 20:39:18 snj Exp $
 
 SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a
 Size (nbitools-R6.3.tar.gz) = 435764 bytes
@@ -8,5 +8,5 @@
 SHA1 (patch-ad) = b0c18505891834182c57819489b7d9890802d550
 SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550
 SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6
-SHA1 (patch-ag) = a7b49c572db220802bb084e586bc6fe0cae87982
+SHA1 (patch-ag) = cd7da1a5c47fc37ee8ade78903cc9195219a4c66
 SHA1 (patch-ah) = ba2e9d00279d44635b2043b642a0407b84329643
diff -r 469c4e2f0497 -r 5a536e32ca78 devel/nbitools/patches/patch-ag
--- a/devel/nbitools/patches/patch-ag   Sat Jan 15 07:01:05 2005 +0000
+++ b/devel/nbitools/patches/patch-ag   Mon Jan 17 20:39:18 2005 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2004/02/21 07:09:50 xtraeme Exp $
+$NetBSD: patch-ag,v 1.1.8.1 2005/01/17 20:39:18 snj Exp $
 
---- config/imake/imake.c.orig  2004-02-21 08:05:07.000000000 +0100
-+++ config/imake/imake.c       2004-02-21 08:05:34.000000000 +0100
-@@ -145,7 +145,7 @@
+--- config/imake/imake.c.orig  2002-02-13 10:32:00.000000000 -0600
++++ config/imake/imake.c
+@@ -145,7 +145,7 @@ in this Software without prior written a
   *    #include INCLUDE_IMAKEFILE
   *    <add any global targets like 'clean' and long dependencies>
   */
 -#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__)
  /* This needs to be before _POSIX_SOURCE gets defined */
  # include <sys/param.h>
  # include <sys/types.h>