* Modify bmake to use libnbcompat to ensure that a regex implementation

  exists.

* nbsed-20040821 requires libnbcompat, so make the appropriate
  adjustments to the build to use it.

* If nbsed is built during bootstrap, then use it as the sed for
  pkg_install so that the correct program is embedded into the pkg_view
  and linkfarm scripts.

* We don't need bmake to build any of the bootstrap packages, so just
  call out to the system make.

3 files changed, 19 insertions, 8 deletions

diff --git a/bootstrap/bmake/Makefile.in b/bootstrap/bmake/Makefile.in
index baa2dc8b379..22262b9bd05 100644
--- a/bootstrap/bmake/Makefile.in
+++ b/bootstrap/bmake/Makefile.in
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.in,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $
+#	$NetBSD: Makefile.in,v 1.2 2004/08/23 03:44:34 jlam Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
-#	$Id: Makefile.in,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $
+#	$Id: Makefile.in,v 1.2 2004/08/23 03:44:34 jlam Exp $
 
 # you can use this Makefile if you have an earlier version of bmake.
 prefix= @prefix@
@@ -14,7 +14,9 @@ MACHINE_ARCH=@machine_arch@
 
 CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} ${CFLAGS_${.TARGET:T}}
 CFLAGS_main.o= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
+LDFLAGS= @LDFLAGS@
 LIBOBJS= @LIBOBJS@
+LDADD= @LIBS@
 
 PROG=	bmake
 SRCS=	arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
diff --git a/bootstrap/bmake/makefile.boot.in b/bootstrap/bmake/makefile.boot.in
index 390b4596760..35e88e36302 100644
--- a/bootstrap/bmake/makefile.boot.in
+++ b/bootstrap/bmake/makefile.boot.in
@@ -1,5 +1,5 @@
 # RCSid:
-#	$Id: makefile.boot.in,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $
+#	$Id: makefile.boot.in,v 1.2 2004/08/23 03:44:34 jlam Exp $
 
 #
 # modify MACHINE and MACHINE_ARCH as appropriate for your target architecture
@@ -27,7 +27,7 @@ bmake:	bmake.boot
 
 bmake.boot: ${OBJ}
 	(cd lst.lib; $(MAKE) -f makefile.boot CC="$(CC)" CFLAGS="-I.. -I${srcdir}/.. ${CFLAGS}" )
-	${CC} *.o -o $@ @LIBS@
+	${CC} *.o -o $@ @LDFLAGS@ @LIBS@
 	rm -f *.[ado] */*.[ado] 
 
 bootstrap:	bmake.boot
diff --git a/bootstrap/bmake/var.c b/bootstrap/bmake/var.c
index 48cf7de5e00..76688887698 100644
--- a/bootstrap/bmake/var.c
+++ b/bootstrap/bmake/var.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $	*/
+/*	$NetBSD: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,20 +39,20 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $");
+__RCSID("$NetBSD: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $");
 #endif
 #endif /* not lint */
 #endif
 
 #if !defined(MAKE_BOOTSTRAP) && !defined(lint)
-__IDSTRING(rcs_id,"$Id: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $");
+__IDSTRING(rcs_id,"$Id: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $");
 #endif
 
 /*-
@@ -100,7 +100,16 @@ __IDSTRING(rcs_id,"$Id: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $");
 #include    <ctype.h>
 #ifndef NO_REGEX
 #include    <sys/types.h>
+#include    <nbcompat/nbconfig.h>
+/* bmake supplies its own <sys/cdefs.h> so this header is always present. */
+#ifndef HAVE_SYS_CDEFS_H
+#define HAVE_SYS_CDEFS_H 1
+#endif
+#if HAVE_REGEX_H
 #include    <regex.h>
+#else
+#include    <nbcompat/regex.h>
+#endif
 #endif
 #include    <stdlib.h>
 #include    "make.h"