From a5778d2e53d19ee747c7eac2fdb4988a35846885 Mon Sep 17 00:00:00 2001
From: rillig <rillig@NetBSD.org>
Date: Sun, 17 Jan 2021 19:32:52 +0000
Subject: [PATCH] lint: install custom stdbool.h, used for strict bool mode

---
 distrib/sets/lists/base/mi   | 3 ++-
 distrib/sets/lists/comp/mi   | 3 ++-
 etc/mtree/NetBSD.dist.base   | 3 ++-
 usr.bin/xlint/xlint/Makefile | 8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 6d14973d0ee8..fa3eeffe3b3a 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1273 2020/12/27 21:13:18 reinoud Exp $
+# $NetBSD: mi,v 1.1274 2021/01/17 19:32:52 rillig Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1560,6 +1560,7 @@
 ./usr/libdata/firmware/radeon/VERDE_smc.bin	base-obsolete	obsolete
 ./usr/libdata/ldscripts				base-c-usr
 ./usr/libdata/lint				base-c-usr
+./usr/libdata/lint/strict-bool			base-c-usr
 ./usr/libexec					base-sys-usr
 ./usr/libexec/atf-check				base-atf-bin		atf
 ./usr/libexec/atf-cleanup			base-obsolete		obsolete
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 1af3e7e409af..1e40af2e57e1 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2370 2021/01/16 22:18:14 rillig Exp $
+#	$NetBSD: mi,v 1.2371 2021/01/17 19:32:52 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -4134,6 +4134,7 @@
 ./usr/libdata/lint/llib-lwrap.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-ly.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lz.ln			comp-c-lintlib		lint
+./usr/libdata/lint/strict-bool/stdbool.h	comp-c-bin
 ./usr/libexec/cc1				comp-c-bin		gcccmds
 ./usr/libexec/cc1obj				comp-objc-bin		gcccmds
 ./usr/libexec/cc1plus				comp-cxx-bin		gcccmds
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index d1ad901475ac..a00d7be7f60e 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.232 2021/01/16 22:18:14 rillig Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.233 2021/01/17 19:32:53 rillig Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -297,6 +297,7 @@
 ./usr/libdata/firmware/bcm43xx
 ./usr/libdata/ldscripts
 ./usr/libdata/lint
+./usr/libdata/lint/strict-bool
 ./usr/libexec
 ./usr/libexec/ching
 ./usr/libexec/lpr
diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile
index 58ec59f084f0..c69cacf89c4e 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2021/01/16 22:18:14 rillig Exp $
+#	$NetBSD: Makefile,v 1.19 2021/01/17 19:32:53 rillig Exp $
 
 .PATH:		${.CURDIR}/../lint1
 .PATH:		${.CURDIR}/../../mkdep
@@ -16,8 +16,8 @@ DPADD+=		${LIBUTIL}
 LDADD+=		-lutil
 .endif
 
-#FILES+=		strict-bool-stdbool.h
-#FILESDIR=	/usr/libdata/lint/strict-bool
-#FILESNAME_strict-bool-stdbool.h= stdbool.h
+FILES+=		strict-bool-stdbool.h
+FILESDIR=	/usr/libdata/lint/strict-bool
+FILESNAME_strict-bool-stdbool.h= stdbool.h
 
 .include <bsd.prog.mk>