Import nbitools-6.3

The itools-R6.3 distribution contains imake, X11 configuration files,
makedepend, xmkmf, mkdirhier, imboot, msub, and imdent.
http://www.kitebird.com/imake-book/
nbitools-R6.3 is rearchived with NetBSD-current/xsrc.

Approved by agc, for inputmethod/{canna-*,sj3-*}

11 files changed, 286 insertions, 0 deletions

diff --git a/devel/nbitools/DESCR b/devel/nbitools/DESCR
new file mode 100644
index 00000000000..a3d7a190902
--- /dev/null
+++ b/devel/nbitools/DESCR
@@ -0,0 +1,4 @@
+The itools-R6.3 distribution contains imake, X11 configuration files,
+makedepend, xmkmf, mkdirhier, imboot, msub, and imdent.
+
+nbitools-R6.3 is rearchived with NetBSD-current/xsrc.
diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile
new file mode 100644
index 00000000000..9400a52ad6a
--- /dev/null
+++ b/devel/nbitools/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/06/03 09:53:46 sakamoto Exp $
+#
+
+DISTNAME=	nbitools-R6.3
+PKGNAME=	nbitools-6.3
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+
+MAINTAINER=	sakamoto@netbsd.org
+HOMEPAGE=	http://www.kitebird.com/imake-book/
+COMMENT=	imake and tools derived from NetBSD-current/xsrc
+
+ALL_TARGET=	World
+MAKE_ENV+=	GCCCMD=gcc
+
+post-patch:
+	@${MV} ${WRKSRC}/config/cf/site.def ${WRKSRC}/config/cf/site.def.orig
+	@${SED} -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|' \
+		${WRKSRC}/config/cf/site.def.orig > ${WRKSRC}/config/cf/site.def
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/nbitools/PLIST b/devel/nbitools/PLIST
new file mode 100644
index 00000000000..d99fcb5aed2
--- /dev/null
+++ b/devel/nbitools/PLIST
@@ -0,0 +1,118 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/03 09:53:46 sakamoto Exp $
+include/itools/X11/Xfuncproto.h
+include/itools/X11/Xos.h
+include/itools/X11/Xosdefs.h
+lib/itools/X11/config/Amoeba.cf
+lib/itools/X11/config/DGUX.cf
+lib/itools/X11/config/Darwin.cf
+lib/itools/X11/config/FreeBSD.cf
+lib/itools/X11/config/Imake.cf
+lib/itools/X11/config/Imake.rules
+lib/itools/X11/config/Imake.tmpl
+lib/itools/X11/config/Library.tmpl
+lib/itools/X11/config/Mips.cf
+lib/itools/X11/config/Motif.rules
+lib/itools/X11/config/Motif.tmpl
+lib/itools/X11/config/NetBSD.cf
+lib/itools/X11/config/Oki.cf
+lib/itools/X11/config/OpenBSD.cf
+lib/itools/X11/config/QNX.cf
+lib/itools/X11/config/QNX.rules
+lib/itools/X11/config/Server.tmpl
+lib/itools/X11/config/ServerLib.tmpl
+lib/itools/X11/config/Threads.tmpl
+lib/itools/X11/config/Win32.cf
+lib/itools/X11/config/Win32.rules
+lib/itools/X11/config/WinLib.tmpl
+lib/itools/X11/config/X11.rules
+lib/itools/X11/config/X11.tmpl
+lib/itools/X11/config/apollo.cf
+lib/itools/X11/config/bsd.cf
+lib/itools/X11/config/bsdLib.rules
+lib/itools/X11/config/bsdLib.tmpl
+lib/itools/X11/config/bsdi.cf
+lib/itools/X11/config/cde.rules
+lib/itools/X11/config/cde.tmpl
+lib/itools/X11/config/convex.cf
+lib/itools/X11/config/cray.cf
+lib/itools/X11/config/fujitsu.cf
+lib/itools/X11/config/generic.cf
+lib/itools/X11/config/gnu.cf
+lib/itools/X11/config/gnuLib.rules
+lib/itools/X11/config/gnuLib.tmpl
+lib/itools/X11/config/host.def
+lib/itools/X11/config/hp.cf
+lib/itools/X11/config/hpLib.rules
+lib/itools/X11/config/hpLib.tmpl
+lib/itools/X11/config/ibm.cf
+lib/itools/X11/config/ibmLib.rules
+lib/itools/X11/config/ibmLib.tmpl
+lib/itools/X11/config/isc.cf
+lib/itools/X11/config/linux-pmac.cf
+lib/itools/X11/config/linux.cf
+lib/itools/X11/config/lnxLib.rules
+lib/itools/X11/config/lnxLib.tmpl
+lib/itools/X11/config/lnxdoc.rules
+lib/itools/X11/config/lnxdoc.tmpl
+lib/itools/X11/config/luna.cf
+lib/itools/X11/config/lynx.cf
+lib/itools/X11/config/macII.cf
+lib/itools/X11/config/mach.cf
+lib/itools/X11/config/minix.cf
+lib/itools/X11/config/moto.cf
+lib/itools/X11/config/ncr.cf
+lib/itools/X11/config/nec.cf
+lib/itools/X11/config/necLib.rules
+lib/itools/X11/config/necLib.tmpl
+lib/itools/X11/config/noop.rules
+lib/itools/X11/config/nto.cf
+lib/itools/X11/config/nto.rules
+lib/itools/X11/config/oldlib.rules
+lib/itools/X11/config/os2.cf
+lib/itools/X11/config/os2.rules
+lib/itools/X11/config/os2Lib.rules
+lib/itools/X11/config/os2Lib.tmpl
+lib/itools/X11/config/osf1.cf
+lib/itools/X11/config/osfLib.rules
+lib/itools/X11/config/osfLib.tmpl
+lib/itools/X11/config/pegasus.cf
+lib/itools/X11/config/sco.cf
+lib/itools/X11/config/sco5.cf
+lib/itools/X11/config/scoLib.rules
+lib/itools/X11/config/sequent.cf
+lib/itools/X11/config/sgi.cf
+lib/itools/X11/config/sgiLib.rules
+lib/itools/X11/config/sgiLib.tmpl
+lib/itools/X11/config/site.def
+lib/itools/X11/config/sony.cf
+lib/itools/X11/config/sun.cf
+lib/itools/X11/config/sunLib.rules
+lib/itools/X11/config/sunLib.tmpl
+lib/itools/X11/config/sv3Lib.rules
+lib/itools/X11/config/sv3Lib.tmpl
+lib/itools/X11/config/sv4Lib.rules
+lib/itools/X11/config/sv4Lib.tmpl
+lib/itools/X11/config/svr3.cf
+lib/itools/X11/config/svr4.cf
+lib/itools/X11/config/ultrix.cf
+lib/itools/X11/config/usl.cf
+lib/itools/X11/config/x386.cf
+lib/itools/X11/config/xf86.rules
+lib/itools/X11/config/xf86.tmpl
+lib/itools/X11/config/xf86site.def
+lib/itools/X11/config/xfree86.cf
+libexec/itools/gccmakedep
+libexec/itools/imake
+libexec/itools/imboot
+libexec/itools/imdent
+libexec/itools/lndir
+libexec/itools/makedepend
+libexec/itools/mkdirhier
+libexec/itools/msub
+libexec/itools/xmkmf
+@dirrm include/itools/X11
+@dirrm include/itools
+@dirrm lib/itools/X11/config
+@dirrm lib/itools/X11
+@dirrm lib/itools
+@dirrm libexec/itools
diff --git a/devel/nbitools/distinfo b/devel/nbitools/distinfo
new file mode 100644
index 00000000000..e8c90a89157
--- /dev/null
+++ b/devel/nbitools/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/06/03 09:53:46 sakamoto 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-ad) = b0c18505891834182c57819489b7d9890802d550
+SHA1 (patch-ae) = 0a0acf8798055a7b1b292e8d2edf998857641550
+SHA1 (patch-af) = b1efcdea967489a035048fc2e7389ac82b106535
diff --git a/devel/nbitools/nbitools.mk b/devel/nbitools/nbitools.mk
new file mode 100644
index 00000000000..e3201c30a1e
--- /dev/null
+++ b/devel/nbitools/nbitools.mk
@@ -0,0 +1,9 @@
+# $NetBSD: nbitools.mk,v 1.1.1.1 2002/06/03 09:53:46 sakamoto Exp $
+.if !defined(NBITOOLS_MK)
+NBITOOLS_MK=	# defined
+
+BUILD_DEPENDS+=	nbitools>=6.3:../../devel/nbitools
+EVAL_PREFIX+=	NBITOOLSDIR=nbitools
+XMKMF_CMD=	${NBITOOLSDIR}/libexec/itools/xmkmf
+
+.endif	# NBITOOLS_MK
diff --git a/devel/nbitools/patches/patch-aa b/devel/nbitools/patches/patch-aa
new file mode 100644
index 00000000000..2843ac9c9bc
--- /dev/null
+++ b/devel/nbitools/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+
+--- include/Imakefile.orig	Thu May 29 22:59:31 1997
++++ include/Imakefile
+@@ -14,7 +14,7 @@
+ 
+ BuildIncludes($(HEADERS),X11,..)
+ 
+-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))
++InstallMultipleFlags($(HEADERS),$(INCDIR)/itools/X11,$(INSTINCFLAGS))
+ 
+ InstallLinkKitNonExecFile(X.h,$(LINKKITDIR)/include)
+ InstallLinkKitNonExecFile(Xmd.h,$(LINKKITDIR)/include)
diff --git a/devel/nbitools/patches/patch-ab b/devel/nbitools/patches/patch-ab
new file mode 100644
index 00000000000..5880d7d5615
--- /dev/null
+++ b/devel/nbitools/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+
+--- config/extras/extras.tmpl.orig	Thu May 29 22:59:30 1997
++++ config/extras/extras.tmpl
+@@ -16,7 +16,7 @@
+  * version of xmkmf.  Comment it out if you want to use the sh version.
+  */
+ 
+-     PERLPATH = /usr/local/bin/perl
++     PERLPATH = /usr/bin/env perl
+ 
+ /*#define UsePerlImboot	YES*/
+ /*#define UsePerlXmkmf	YES*/
diff --git a/devel/nbitools/patches/patch-ac b/devel/nbitools/patches/patch-ac
new file mode 100644
index 00000000000..7d7f62cb1e7
--- /dev/null
+++ b/devel/nbitools/patches/patch-ac
@@ -0,0 +1,25 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+
+--- config/util/xmkmf.cpp.orig	Thu May 29 22:59:30 1997
++++ config/util/xmkmf.cpp
+@@ -41,10 +41,10 @@
+     args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
+ fi
+ 
+-echo imake $args
++echo BINDIRSPEC/imake $args
+ case "$do_all" in
+ yes)
+-    imake $args && 
++    BINDIRSPEC/imake $args && 
+     echo "make Makefiles" &&
+     make Makefiles &&
+     echo "make includes" &&
+@@ -53,6 +53,6 @@
+     make depend
+     ;;
+ *)
+-    imake $args
++    BINDIRSPEC/imake $args
+     ;;
+ esac
diff --git a/devel/nbitools/patches/patch-ad b/devel/nbitools/patches/patch-ad
new file mode 100644
index 00000000000..80aeee61a1d
--- /dev/null
+++ b/devel/nbitools/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+
+--- config/cf/Imake.tmpl.orig	Wed Mar  7 22:08:22 2001
++++ config/cf/Imake.tmpl
+@@ -961,7 +961,7 @@
+ #endif
+ #ifndef ImakeCmd
+ #ifdef UseInstalled		/* assume BINDIR in path */
+-#define ImakeCmd imake
++#define ImakeCmd $(BINDIR)/imake
+ #else
+ #define ImakeCmd $(IMAKESRC)/imake
+ #endif
+@@ -969,13 +969,13 @@
+ #ifndef DependCmd
+ #if UseGccMakeDepend
+ #ifdef UseInstalled		/* assume BINDIR in path */
+-#define DependCmd gccmakedep
++#define DependCmd $(BINDIR)/gccmakedep
+ #else
+ #define DependCmd $(DEPENDSRC)/gccmakedep
+ #endif
+ #else
+ #ifdef UseInstalled		/* assume BINDIR in path */
+-#define DependCmd makedepend
++#define DependCmd $(BINDIR)/makedepend
+ #else
+ #define DependCmd $(DEPENDSRC)/makedepend
+ #endif
+@@ -1002,7 +1002,7 @@
+ #endif
+ #ifndef MkdirHierCmd
+ #ifdef UseInstalled		/* assume BINDIR in path */
+-#define MkdirHierCmd mkdirhier
++#define MkdirHierCmd $(BINDIR)/mkdirhier
+ #else
+ #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
+ #endif
diff --git a/devel/nbitools/patches/patch-ae b/devel/nbitools/patches/patch-ae
new file mode 100644
index 00000000000..3a1af0929b6
--- /dev/null
+++ b/devel/nbitools/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+
+--- config/cf/X11.tmpl.orig	Thu Jan 21 21:50:39 1999
++++ config/cf/X11.tmpl
+@@ -628,7 +628,7 @@
+ #endif
+ #ifndef BinDir
+ #ifdef ProjectRoot
+-#define BinDir Concat(ProjectRoot,/bin)
++#define BinDir Concat(ProjectRoot,/libexec/itools)
+ #else
+ #define BinDir /usr/bin/X11
+ #endif
+@@ -678,7 +678,7 @@
+ #define BuildLibTop ../..	/* relative to BuildLibDir */
+ #endif
+ #ifndef LibDir
+-#define LibDir $(USRLIBDIR)/X11
++#define LibDir $(USRLIBDIR)/itools/X11
+ #endif
+ #ifndef ConfigDir
+ #define ConfigDir $(LIBDIR)/config
diff --git a/devel/nbitools/patches/patch-af b/devel/nbitools/patches/patch-af
new file mode 100644
index 00000000000..be14ad3499b
--- /dev/null
+++ b/devel/nbitools/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/06/03 09:53:47 sakamoto Exp $
+
+--- config/util/Imakefile.orig	Thu May 29 22:59:30 1997
++++ config/util/Imakefile
+@@ -37,7 +37,7 @@
+ PerlScriptTarget(xmkmf,xmkmf.pl,NullParameter)
+ #else
+ AllTarget(ProgramTargetName(xmkmf))
+-CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES))
++CppScriptTarget(ProgramTargetName(xmkmf),xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"' -DBINDIRSPEC="$(BINDIR)",$(ICONFIGFILES))
+ install:: install.ProgramTargetName(xmkmf)
+ InstallMultipleDestFlags(install.ProgramTargetName(xmkmf),ProgramTargetName(xmkmf),$(BINDIR),$(INSTBINFLAGS))
+ #endif