diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 36c601bcbe36..3baf3d0baf0f 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -1,42 +1,42 @@
 
 .include "${SRCTOP}/lib/clang/clang.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libclang
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/clang.build.mk"
 
 # Special case for the bootstrap-tools phase.
 .if (defined(TOOLS_PREFIX) || ${MACHINE} == "host") && \
     ${PROG_CXX} == "clang-tblgen"
 LIBDEPS+=	clangminimal
 LIBDEPS+=	llvmminimal
 .else
 LIBDEPS+=	clang
 LIBDEPS+=	llvm
 LIBADD+=	z
 LIBADD+=	zstd
 .endif
 
 .if defined(TOOLS_PREFIX)
 LIBPRIV=
 LIBEXT=		a
 .else
 LIBPRIV=	private
 LIBEXT=		so
 .endif
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
 .endfor
 
-PACKAGE=	clang
+PACKAGE?=	clang
 
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 LIBADD+=	execinfo
 LIBADD+=	ncursesw
 .endif
 LIBADD+=	pthread
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index fd12b1ddef57..e019c89b3581 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -1,17 +1,18 @@
 .include <src.opts.mk>
 
+PACKAGE=	toolchain
 PROG_CXX=	llvm-ar
 MAN=		llvm-ar.1 llvm-ranlib.1
 
 SRCDIR=		llvm/tools/llvm-ar
 SRCS+=		llvm-ar-driver.cpp
 SRCS+=		llvm-ar.cpp
 
 LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
 
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib
 MLINKS+=	llvm-ar.1 ar.1 llvm-ar.1 ranlib.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 825faf74719b..7e089d1b408d 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -1,30 +1,31 @@
 .include <src.opts.mk>
 
+PACKAGE=	toolchain
 PROG_CXX=	llvm-nm
 
 SRCDIR=		llvm/tools/llvm-nm
 SRCS+=		llvm-nm-driver.cpp
 SRCS+=		llvm-nm.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 
 INCFILE=	Opts.inc
 TDFILE=		${LLVM_BASE}/${SRCDIR}/Opts.td
 GENOPT=		-gen-opt-parser-defs
 ${INCFILE}: ${TDFILE}
 	${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${TDFILE}
 TGHDRS+=	${INCFILE}
 
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-nm ${BINDIR}/nm
 MLINKS+=	llvm-nm.1 nm.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile
index 2860a0069538..9d3505cdd319 100644
--- a/usr.bin/clang/llvm-size/Makefile
+++ b/usr.bin/clang/llvm-size/Makefile
@@ -1,30 +1,31 @@
 .include <src.opts.mk>
 
+PACKAGE=	toolchain
 PROG_CXX=	llvm-size
 
 SRCDIR=		llvm/tools/llvm-size
 SRCS+=		llvm-size-driver.cpp
 SRCS+=		llvm-size.cpp
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${.OBJDIR}
 
 INCFILE=	Opts.inc
 TDFILE=		${LLVM_BASE}/${SRCDIR}/Opts.td
 GENOPT=		-gen-opt-parser-defs
 ${INCFILE}: ${TDFILE}
 	${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \
 	    -o ${.TARGET} ${TDFILE}
 TGHDRS+=	${INCFILE}
 
 DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 .if ${MK_LLVM_BINUTILS} != "no"
 LINKS+=		${BINDIR}/llvm-size ${BINDIR}/size
 MLINKS+=	llvm-size.1 size.1
 .endif
 
 .include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk
index f702082e31bd..c369fe8d5944 100644
--- a/usr.bin/clang/llvm.prog.mk
+++ b/usr.bin/clang/llvm.prog.mk
@@ -1,36 +1,36 @@
 
 .include "${SRCTOP}/lib/clang/llvm.pre.mk"
 
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 
 .include "${SRCTOP}/lib/clang/llvm.build.mk"
 
 # Special case for the bootstrap-tools phase.
 .if (defined(TOOLS_PREFIX) || ${MACHINE} == "host") && \
     (${PROG_CXX} == "clang-tblgen" || ${PROG_CXX} == "lldb-tblgen" || \
      ${PROG_CXX} == "llvm-min-tblgen" || ${PROG_CXX} == "llvm-tblgen")
 LIBDEPS+=	llvmminimal
 LIBPRIV=
 LIBEXT=		a
 .else
 LIBDEPS+=	llvm
 LIBPRIV=	private
 LIBEXT=		so
 LIBADD+=	z
 LIBADD+=	zstd
 .endif
 
 .for lib in ${LIBDEPS}
 DPADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
 LDADD+=		${OBJTOP}/lib/clang/lib${lib}/lib${LIBPRIV}${lib}.${LIBEXT}
 .endfor
 
-PACKAGE=	clang
+PACKAGE?=	clang
 
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
 LIBADD+=	execinfo
 LIBADD+=	tinfow
 .endif
 LIBADD+=	pthread
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile
index 8e2572810947..c01e775b0b89 100644
--- a/usr.bin/strings/Makefile
+++ b/usr.bin/strings/Makefile
@@ -1,19 +1,21 @@
 .include <src.opts.mk>
 
+PACKAGE=	toolchain
+
 ELFTCDIR=	${SRCTOP}/contrib/elftoolchain
 
 .PATH: ${ELFTCDIR}/strings
 
 PROG=	strings
 
 LIBADD=	elftc elf
 
 .if ${MK_CASPER} != "no" && !defined(BOOTSTRAPPING) && !defined(NXB_TARGET)
 LIBADD+=	casper
 LIBADD+=	cap_fileargs
 CFLAGS+=	-DWITH_CASPER
 .endif
 
 CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common
 
 .include <bsd.prog.mk>