[pkgsrc/trunk]: pkgsrc Change bootstrap to register bmake as package. Change ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0ad62036a25
branches:  trunk
changeset: 527739:b0ad62036a25
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 12 20:31:04 2007 +0000

description:
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@

diffstat:

 bootstrap/bootstrap   |   3 ++-
 bootstrap/mkbinarykit |  19 +++++++------------
 devel/bmake/Makefile  |  12 ++++--------
 3 files changed, 13 insertions(+), 21 deletions(-)

diffs (122 lines):

diff -r 9a5d918b4b3c -r b0ad62036a25 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Apr 12 20:23:30 2007 +0000
+++ b/bootstrap/bootstrap       Thu Apr 12 20:31:04 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.93 2007/04/12 14:36:40 joerg Exp $
+# $NetBSD: bootstrap,v 1.94 2007/04/12 20:31:04 joerg Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -894,6 +894,7 @@
 
 echo_msg "Registering installed packages"
 register_package "pkgtools/bootstrap-mk-files"
+register_package "devel/bmake"
 case "$need_awk" in
 yes)   register_package "lang/nawk";;
 esac
diff -r 9a5d918b4b3c -r b0ad62036a25 bootstrap/mkbinarykit
--- a/bootstrap/mkbinarykit     Thu Apr 12 20:23:30 2007 +0000
+++ b/bootstrap/mkbinarykit     Thu Apr 12 20:31:04 2007 +0000
@@ -1,11 +1,10 @@
 #!/bin/sh
 
-# $NetBSD: mkbinarykit,v 1.15 2006/04/11 14:35:48 joerg Exp $
+# $NetBSD: mkbinarykit,v 1.16 2007/04/12 20:31:04 joerg Exp $
 #
 # Make a binary bootstrap kit and place it in targetdir (or current
 # working directory if not specified). The mk.conf.example file is
-# copied to /etc/mk.conf (or /etc/mk.conf.example on systems which
-# may already have a /etc/mk.conf file) or to the location specified
+# copied to ${PREFIX}/etc/mk.conf or to the location specified
 # by using --mkconf. Run this program from the pkgsrc/bootstrap
 # directory.
 
@@ -20,23 +19,22 @@
 date=`date +%Y%m%d`
 
 prefix=/usr/pkg
-sysconfdir=/etc
+sysconfdir=$prefix/etc
 pkgdbdir=/var/db/pkg
-mkfile=$sysconfdir/mk.conf
+mkfile=
 ignorecasecheck=no
 ignoreusercheck=no
 force=no
 build=yes
 fetch_cmd=""
 targetdir=`pwd`
-wrkdir=work            # default: relative to pkgsrc/bootstrap
+wrkdir=`pwd`/work              # default: relative to pkgsrc/bootstrap
 
 sedprog="sed" 
 
 case "$opsys" in
 AIX)
        syscondir=$prefix/etc
-       mkfile=$sysconfdir/mk.conf
        pkgdbdir=$prefix/pkgdb
        ;;
 DragonFly)
@@ -54,18 +52,13 @@
        pkgdbdir=$prefix/pkgdb
        ;;
 Interix)
-       mkfile=$sysconfdir/mk.conf.example
        # Don't use the interopsystems.com package dir
        pkgdbdir=$prefix/pkgdb
        ospro=i386
        ;;
 NetBSD)
-       # Don't overwrite the system's mk.conf
-       mkfile=$sysconfdir/mk.conf.example
        ;;
 OpenBSD)
-       # Don't overwrite the system's mk.conf
-       mkfile=$sysconfdir/mk.conf.example
        # Don't use the ports /var/db/pkg
        pkgdbdir=$prefix/pkgdb
        # Use "arch -s" instead of uname -p
@@ -93,6 +86,8 @@
         shift
 done
 
+[ -z "${mkfile}" ] && mkfile="$prefix/etc/mk.conf"
+
 if [ "$build" = "yes" ] && [ "$force" != "yes" ]; then
        if [ -d "$prefix" ] || [ -d "$pkgdbdir" ]; then
                echo "Some pkgsrc infrastructure exists on this system already."
diff -r 9a5d918b4b3c -r b0ad62036a25 devel/bmake/Makefile
--- a/devel/bmake/Makefile      Thu Apr 12 20:23:30 2007 +0000
+++ b/devel/bmake/Makefile      Thu Apr 12 20:31:04 2007 +0000
@@ -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-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 @@
        ${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"