Handle cases where pkgsrc bootstrap installs tools, e.g. pax, tar, sed.

Where bootstrap installs these tools, they should be considered system-
supplied since pkgsrc won't be providing replacements for them.

bootstrap.mk encapulates the information from the bootstrap script.  It
should eventually go away after the bootstrap script has been taught to
write out the correct TOOLS_PLATFORM.* entries to the example mk.conf
file.

2 files changed, 94 insertions, 1 deletions

diff --git a/mk/tools/bootstrap.mk b/mk/tools/bootstrap.mk
new file mode 100644
index 00000000000..845fef098cf
--- /dev/null
+++ b/mk/tools/bootstrap.mk
@@ -0,0 +1,92 @@
+# $NetBSD: bootstrap.mk,v 1.1 2005/04/27 17:15:13 jlam Exp $
+#
+# bootstrap.mk contains settings matching the contents of
+# pkgsrc/bootstrap/bootstrap.  Where we install the bootstrap versions
+# of tools, we point TOOLS_PLATFORM.* to them so that pkgsrc knows
+# that they are system-supplied and won't need replacement by pkgsrc
+# versions of those tools.
+#
+# XXX This file should go away and the bootstrap script should be
+# XXX taught to write out the correct TOOLS_PLATFORM.* definitions
+# XXX on its own, based on the configuration used.
+# 
+
+.if ${OPSYS} == "AIX"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.strip?=		${LOCALBASE}/bin/strip
+
+.elif ${OPSYS} == "Darwin"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+
+.elif ${OPSYS} == "DragonFly"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+
+.elif ${OPSYS} == "FreeBSD"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+
+.elif ${OPSYS} == "HPUX"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+
+.elif ${OPSYS} == "Interix"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+
+.elif ${OPSYS} == "IRIX"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+
+.elif ${OPSYS} == "Linux"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+
+.elif ${OPSYS} == "NetBSD"
+# NetBSD has everything.
+
+.elif ${OPSYS} == "OpenBSD"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+
+.elif ${OPSYS} == "OSF1"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+
+.elif ${OPSYS} == "SunOS"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+
+.elif ${OPSYS} == "UnixWare"
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.mkdir?=		${LOCALBASE}/sbin/mkdir-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+
+.else
+TOOLS_PLATFORM.gtar?=		${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+.endif
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 7a3d2d55814..30433c0d96f 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.41 2005/04/27 16:52:28 jlam Exp $
+# $NetBSD: replace.mk,v 1.42 2005/04/27 17:15:13 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -47,6 +47,7 @@ USE_TOOLS+=	perl
 # XXX These should eventually just migrate over to the appropriate
 # XXX pkgsrc/mk/platform/${OPSYS}.mk file.
 #
+.include "../../mk/tools/bootstrap.mk"
 .if exists(../../mk/tools/tools.${OPSYS}.mk)
 .  include "../../mk/tools/tools.${OPSYS}.mk"
 .endif