CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct  4 11:47:45 UTC 2022

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Add mktools to special preserve handling.


To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.316 pkgsrc/bootstrap/bootstrap:1.317
--- pkgsrc/bootstrap/bootstrap:1.316    Thu Sep 29 02:25:15 2022
+++ pkgsrc/bootstrap/bootstrap  Tue Oct  4 11:47:45 2022
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.316 2022/09/29 02:25:15 charlotte Exp $
+# $NetBSD: bootstrap,v 1.317 2022/10/04 11:47:45 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1432,8 +1432,8 @@ build_package_nopreserve() {
 }
 
 #
-# cwrappers is special, we don't want to set it as a BOOTSTRAP_PKG but must
-# build it (if required) without -DPKG_PRESERVE set so that it can be deleted.
+# Special packages that we don't want marked with BOOTSTRAP_PKG, but must be
+# built (if required) without -DPKG_PRESERVE set so that they can be deleted.
 #
 use_cwrappers=`(cd $pkgsrcdir/devel/bmake && $bmake show-var VARNAME=_USE_CWRAPPERS)`
 case "$use_cwrappers" in
@@ -1441,6 +1441,12 @@ yes)
        build_package_nopreserve "pkgtools/cwrappers"
        ;;
 esac
+use_mktools=`(cd $pkgsrcdir/devel/bmake && $bmake show-var VARNAME=_PKGSRC_USE_MKTOOLS)`
+case "$use_mktools" in
+yes)
+       build_package_nopreserve "pkgtools/mktools"
+       ;;
+esac
 
 #
 # Please make sure that the following packages and