From 1a02416b5f751e710a8c8ac50a104b5fc8da141e Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Thu, 12 Apr 2007 20:31:04 +0000
Subject: Change bootstrap to register bmake as package. Change bmake to use
 inplace libnbcompat like the direct build from bootstrap does. Fix a
 long-standing bug in mkbinarykit. The default work directory was "work"
 (relative) and therefore MAKECONF=work/... was passed down, effectively
 making it a nop. That resulted in digest being incorrectly installed during
 the bootstrap.

Tested on DragonFly by myself and on OSF by tnn@, discussed with jlam@
---
 devel/bmake/Makefile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'devel')

diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index 799c8cdc65b..5dd0d9274e0 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/03/05 00:24:33 dbj Exp $
+# $NetBSD: Makefile,v 1.34 2007/04/12 20:31:05 joerg Exp $
 #
 
 DISTNAME=	bmake-20051105
@@ -31,7 +31,8 @@ do-configure:
 
 do-build:
 	cd ${WRKDIR} && \
-		./bmake/boot-strap -q -o ${OPSYS} --prefix=${PREFIX} \
+		${SETENV} ${MAKE_ENV} ${SH} ./bmake/boot-strap \
+		-q -o ${OPSYS} --prefix=${PREFIX} \
 		--with-default-sys-path=${makesyspath} --mksrc none \
 		--sysconfdir=${PKG_SYSCONFDIR}
 
@@ -39,10 +40,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/bmake.1 ${PREFIX}/${PKGMANDIR}/man1
 
-.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace")
-.  include "../../pkgtools/libnbcompat/inplace.mk"
-.else
-.  include "../../pkgtools/libnbcompat/buildlink3.mk"
-.endif
-
+.include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3