Apply patches provided by MOCHIDA Shuji in PR pkg/29889 to teach

nbitools more about Darwin.

5 files changed, 74 insertions, 8 deletions

diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile
index 2c333189c60..04f27a8cd6d 100644
--- a/devel/nbitools/Makefile
+++ b/devel/nbitools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:28 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/08 03:14:35 minskim Exp $
 #
 
 DISTNAME=	nbitools-R6.3
 PKGNAME=	nbitools-6.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo
index 8be83cfeeba..46dd760cbd8 100644
--- a/devel/nbitools/distinfo
+++ b/devel/nbitools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/04/05 15:22:11 minskim Exp $
+$NetBSD: distinfo,v 1.7 2005/05/08 03:14:35 minskim Exp $
 
 SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a
 RMD160 (nbitools-R6.3.tar.gz) = 047f64b113a0307b045573bfe429b59063ae38ea
@@ -10,4 +10,6 @@ SHA1 (patch-ad) = b0c18505891834182c57819489b7d9890802d550
 SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550
 SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6
 SHA1 (patch-ag) = cd7da1a5c47fc37ee8ade78903cc9195219a4c66
-SHA1 (patch-ah) = 4fc71b5dbf370f3d48b4b0ed95fef3cc249434c5
+SHA1 (patch-ah) = 1048c4cda63de7bd23213785d7614ec8e00f0c9c
+SHA1 (patch-ai) = 9085fda5360c672865561e2c0aeafdc34596eb66
+SHA1 (patch-aj) = ab3f2807a92bf228ec1aa8bfb8a586de964e3a1c
diff --git a/devel/nbitools/patches/patch-ah b/devel/nbitools/patches/patch-ah
index 8fdb416483a..7ebb522333f 100644
--- a/devel/nbitools/patches/patch-ah
+++ b/devel/nbitools/patches/patch-ah
@@ -1,8 +1,20 @@
-$NetBSD: patch-ah,v 1.2 2005/04/05 15:22:11 minskim Exp $
+$NetBSD: patch-ah,v 1.3 2005/05/08 03:14:35 minskim Exp $
 
---- config/imake/imakemdep.h.orig	2004-02-21 08:06:05.000000000 +0100
-+++ config/imake/imakemdep.h	2004-02-21 08:06:50.000000000 +0100
-@@ -253,7 +253,7 @@
+--- config/imake/imakemdep.h.orig	2002-02-12 13:36:00.000000000 -0600
++++ config/imake/imakemdep.h
+@@ -234,6 +234,11 @@ in this Software without prior written a
+  *     If use cc -E but want a different compiler, define DEFAULT_CC.
+  *     If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
+  */
++
++#if defined(__APPLE__)
++#define DEFAULT_CPP "/usr/bin/cpp"
++#define DEFAULT_CC "cc"
++#endif
+ #ifdef hpux
+ #define USE_CC_E
+ #endif
+@@ -253,7 +258,7 @@ in this Software without prior written a
  #if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__))
  #define DEFAULT_CPP "/usr/ccs/lib/cpp"
  #endif
@@ -11,3 +23,16 @@ $NetBSD: patch-ah,v 1.2 2005/04/05 15:22:11 minskim Exp $
  #define DEFAULT_CPP "/usr/bin/cpp"
  #endif
  #ifdef __uxp__
+@@ -639,6 +644,12 @@ char *cpp_argv[ARGUMENTS] = {
+ # define DEFAULT_OS_MINOR_REV	"v %*d.%1s"
+ # define DEFAULT_OS_TEENY_REV	"v %*d.%*c%[.0-9]"
+ # define DEFAULT_OS_NAME	"srvm %[^\n]"
++# elif defined(__APPLE__)
++/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
++#  define DEFAULT_OS_MAJOR_REV  "r %[0-9]"
++#  define DEFAULT_OS_MINOR_REV  "r %*d.%[0-9]"
++#  define DEFAULT_OS_TEENY_REV  "r %*d.%*d.%[0-9]" /* this will just get 0 */
++#  define DEFAULT_OS_NAME       "s %[^\n]"
+ #elif defined(__osf__)
+ /* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */
+ # define DEFAULT_OS_MAJOR_REV	"r %*[^0-9]%[0-9]"
diff --git a/devel/nbitools/patches/patch-ai b/devel/nbitools/patches/patch-ai
new file mode 100644
index 00000000000..871858d13cf
--- /dev/null
+++ b/devel/nbitools/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/05/08 03:14:35 minskim Exp $
+
+--- config/cf/Darwin.cf.orig	2001-07-02 22:54:07.000000000 -0500
++++ config/cf/Darwin.cf
+@@ -64,7 +64,7 @@ XCOMM operating system:  OSName (OSMajor
+ #define IncludeMakefile(file)	@@# dependencies are in .depend
+ #define DependFileName		.depend
+ #ifndef ExtraLibraries
+-#define ExtraLibraries		-lgnumalloc
++#define ExtraLibraries		/* -lgnumalloc */
+ #endif
+ #else
+ #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
diff --git a/devel/nbitools/patches/patch-aj b/devel/nbitools/patches/patch-aj
new file mode 100644
index 00000000000..831b0d3cbaf
--- /dev/null
+++ b/devel/nbitools/patches/patch-aj
@@ -0,0 +1,26 @@
+$NetBSD: patch-aj,v 1.1 2005/05/08 03:14:35 minskim Exp $
+
+--- config/cf/Imake.cf.orig	2005-05-07 21:33:29.000000000 -0500
++++ config/cf/Imake.cf
+@@ -19,6 +19,21 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
+  *     4.  Create a .cf file with the name given by MacroFile.
+  */
+ 
++#if defined(__APPLE__)
++# undef __APPLE__
++# define MacroIncludeFile <Darwin.cf>
++# define MacroFile Darwin.cf
++# define DarwinArchitecture
++# ifdef __ppc__
++#  define PpcDarwinArchitecture
++#  undef __ppc__
++# endif
++# ifdef __i386__
++#  define i386DarwinArchitecture
++#  undef __i386__
++# endif
++#endif
++
+ #if defined(clipper) || defined(__clipper__)
+ # undef clipper
+ # define MacroIncludeFile <ingr.cf>