Change an argument passed to cpp so that it will not confuse buildlink3.

The problem was reported by Yasushi Oshima on tech-pkg-ja@jp.NetBSD.org.

4 files changed, 18 insertions, 8 deletions

diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile
index 0dd5054c7c6..7d6873b0e03 100644
--- a/devel/nbitools/Makefile
+++ b/devel/nbitools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/03/05 21:15:53 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/29 18:59:25 minskim Exp $
 #
 
 DISTNAME=	nbitools-R6.3
 PKGNAME=	nbitools-6.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo
index 5bf33f8dcd6..83cac3f6797 100644
--- a/devel/nbitools/distinfo
+++ b/devel/nbitools/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2004/02/21 07:09:50 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/04/29 18:59:25 minskim Exp $
 
 SHA1 (nbitools-R6.3.tar.gz) = 0f6751417d7ef412be04611fbe4f56386a04322a
 Size (nbitools-R6.3.tar.gz) = 435764 bytes
 SHA1 (patch-aa) = df66d326f0a5375f829353084bf9935ac2d8e57c
 SHA1 (patch-ab) = 4cc71d9e9a3c12106deff9d60118d363ae3ba981
-SHA1 (patch-ac) = bf74465560aa7850ed6f666566ec4a940aca3a67
+SHA1 (patch-ac) = 4cb8804bae2d7e815b36640c55789b5ed7b7fb75
 SHA1 (patch-ad) = b0c18505891834182c57819489b7d9890802d550
 SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550
-SHA1 (patch-af) = b1efcdea967489a035048fc2e7389ac82b106535
+SHA1 (patch-af) = 9a7e4bd19863d086a1e57f1cd9484b05189cbda6
 SHA1 (patch-ag) = a7b49c572db220802bb084e586bc6fe0cae87982
 SHA1 (patch-ah) = ba2e9d00279d44635b2043b642a0407b84329643
diff --git a/devel/nbitools/patches/patch-ac b/devel/nbitools/patches/patch-ac
index 7d7f62cb1e7..43c8088ac5f 100644
--- a/devel/nbitools/patches/patch-ac
+++ b/devel/nbitools/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/29 18:59:25 minskim Exp $
 
 --- config/util/xmkmf.cpp.orig	Thu May 29 22:59:30 1997
 +++ config/util/xmkmf.cpp
-@@ -41,10 +41,10 @@
+@@ -7,7 +7,7 @@ XCOMM $XConsortium: xmkmf.cpp /main/22 1
+ 
+ usage="usage:  $0 [-a] [top_of_sources_pathname [current_directory]]"
+ 
+-configdirspec=CONFIGDIRSPEC
++configdirspec="-I"CONFIGDIRSPEC
+ topdir=
+ curdir=.
+ do_all=
+@@ -41,10 +41,10 @@ else
      args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
  fi
  
diff --git a/devel/nbitools/patches/patch-af b/devel/nbitools/patches/patch-af
index be14ad3499b..26c058f5aa7 100644
--- a/devel/nbitools/patches/patch-af
+++ b/devel/nbitools/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+$NetBSD: patch-af,v 1.2 2004/04/29 18:59:25 minskim Exp $
 
 --- config/util/Imakefile.orig	Thu May 29 22:59:30 1997
 +++ config/util/Imakefile
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
  #else
  AllTarget(ProgramTargetName(xmkmf))
 -CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES))
-+CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"' -DBINDIRSPEC="$(BINDIR)",$(ICONFIGFILES))
++CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"$(CONFIGDIR)"'"' -DBINDIRSPEC="$(BINDIR)",$(ICONFIGFILES))
  install:: install.ProgramTargetName(xmkmf)
  InstallMultipleDestFlags(install.ProgramTargetName(xmkmf),ProgramTargetName(xmkmf),$(BINDIR),$(INSTBINFLAGS))
  #endif