From d4fdfd3f9077216e52f38f7364974959c9e43168 Mon Sep 17 00:00:00 2001
From: Jessica Clarke <jrtc27@FreeBSD.org>
Date: Sun, 29 Jan 2023 23:51:30 +0000
Subject: [PATCH] Makefile.inc1: Restore adding tzsetup to
 _basic_bootstrap_tools

ITOOLS is only the list of programs to make a copy of during install, it
doesn't cause anything to be bootstrapped. Thus, by removing tzsetup
from _basic_bootstrap_tools, we end up without it on non-FreeBSD, and so
we error out trying to copy it to INSTALLTMP.

Note that _basic_bootstrap_tools is only used for BOOTSTRAP_ALL_TOOLS
(which is why zic was moved away from it). Should tzsetup evolve such
that the host version is insufficient on older FreeBSD it can be moved
to be more like zic, but that seems unnecessary for what is likely to
remain a simple tool.

This partially reverts commit 7a4a520064cb7fbff79560113682d6fe1a1ae9ee.

Fixes:	7a4a520064cb ("Fix cross-build from STABLE or older CURRENT.")
---
 Makefile.inc1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index dfc9cb8d07f..7c82c2bfa76 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2446,6 +2446,11 @@ _basic_bootstrap_tools+=usr.bin/jot
 _basic_bootstrap_tools+=sbin/md5
 .endif
 
+# tzsetup is needed as an install tool
+.if ${MK_ZONEINFO} != "no"
+_basic_bootstrap_tools+=usr.sbin/tzsetup
+.endif
+
 .if defined(BOOTSTRAP_ALL_TOOLS)
 _other_bootstrap_tools+=${_basic_bootstrap_tools}
 .for _subdir _links in ${_basic_bootstrap_tools_multilink}