22 files changed, 49 insertions, 81 deletions
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 10d55215c0b3..571d1c59a544 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -1,22 +1,16 @@
-# $FreeBSD$
-
 .include <src.opts.mk>
 
-SUBDIR= \
+SUBDIR.${MK_DTRACE}+= \
 	ctfconvert \
 	ctfdump \
-	ctfmerge \
-	${_zinject} \
-	${_zstream} \
-	${_ztest}
+	ctfmerge
 
 SUBDIR.${MK_TESTS}+= tests
 
-.if ${MK_ZFS} != "no"
-_zinject= zinject
-_ztest=	ztest
-_zstream = zstream
-.endif
+SUBDIR.${MK_ZFS}+= \
+	zinject \
+	ztest \
+	zstream
 
 SUBDIR_PARALLEL=
 
diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc
index 4cec6fe01a45..b87015c546ca 100644
--- a/cddl/usr.bin/Makefile.inc
+++ b/cddl/usr.bin/Makefile.inc
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 BINDIR?=	/usr/bin
 
 .include "../Makefile.inc"
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index 78b65020452a..cd9f850f480c 100644
--- a/cddl/usr.bin/ctfconvert/Makefile
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -1,10 +1,9 @@
-# $FreeBSD$
-
 .include <src.opts.mk>
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
 
+PACKAGE=	ctf-tools
 PROG=		ctfconvert
 SRCS=		alist.c \
 		ctf.c \
diff --git a/cddl/usr.bin/ctfconvert/Makefile.depend b/cddl/usr.bin/ctfconvert/Makefile.depend
index eb40124b7c90..69aabda6c27e 100644
--- a/cddl/usr.bin/ctfconvert/Makefile.depend
+++ b/cddl/usr.bin/ctfconvert/Makefile.depend
@@ -1,11 +1,9 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
+	cddl/lib/libspl \
 	include \
 	include/xlocale \
-	cddl/lib/libspl \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
diff --git a/cddl/usr.bin/ctfconvert/ctfconvert.1 b/cddl/usr.bin/ctfconvert/ctfconvert.1
index c7b01c9315ce..8baf9895b0e1 100644
--- a/cddl/usr.bin/ctfconvert/ctfconvert.1
+++ b/cddl/usr.bin/ctfconvert/ctfconvert.1
@@ -1,4 +1,6 @@
 .\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
 .\" Copyright (c) 2010 The FreeBSD Foundation 
 .\" All rights reserved. 
 .\" 
@@ -26,51 +28,53 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 .\" SUCH DAMAGE. 
 .\"
-.\" $FreeBSD$
-.\"
 .Dd April 21, 2022
 .Dt CTFCONVERT 1
 .Os
 .Sh NAME
 .Nm ctfconvert
-.Nd convert debug data to CTF data
+.Nd convert debug data to Compact C Type Format data
 .Sh SYNOPSIS
 .Nm
 .Op Fl gis
-.Fl l Ar label
 .Fl L Ar labelenv
+.Fl l Ar label
 .Op Fl o Ar outfile
 object_file
 .Sh DESCRIPTION
 The
 .Nm
-utility converts debug information from a binary file to CTF (Compact C Type
-Format) data and replaces the debug section of that file with a CTF section
+utility converts debug information from a binary file to CTF
+.Pq Compact C Type Format
+data and replaces the debug section of that file with a CTF section
 called SUNW_ctf.
-This new section is added to the input file, unless the -o
+This new section is added to the input file, unless the
+.Fl o
 option is present.
 You can also opt to keep the original debugging section with the
--g option.
+.Fl g
+option.
 .Pp
 The following options are available:
-.Bl -tag -width indent
-.It Fl l Ar label
-Sets the label as
-.Ar label .
-.It Fl L Ar labelenv
-Instructs
-.Nm
-to read the label from the environment variable
-.Ar labelenv .
+.Bl -tag -width "-L labelenv"
 .It Fl g
 Don't delete the original debugging section.
 .It Fl i
 Ignore object files built from other languages than C.
-.It Fl s
-Use the .dynsym ELF section instead of the .symtab ELF section.
+.It Fl L Ar labelenv
+Instructs
+.Nm
+to read the label from the
+.Ev labelenv
+environment variable.
+.It Fl l Ar label
+Sets the label as
+.Ar label .
 .It Fl o Ar outfile
 Write the output to file in
 .Ar outfile .
+.It Fl s
+Use the .dynsym ELF section instead of the .symtab ELF section.
 .El
 .Sh EXIT STATUS
 .Ex -std
diff --git a/cddl/usr.bin/ctfconvert/tests/Makefile b/cddl/usr.bin/ctfconvert/tests/Makefile
index 431a1f25bd9f..d86ddbcd635f 100644
--- a/cddl/usr.bin/ctfconvert/tests/Makefile
+++ b/cddl/usr.bin/ctfconvert/tests/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 ATF_TESTS_SH+=  ctfconvert_test
 
 .include <bsd.test.mk>
diff --git a/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh b/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh
index 04723fd08ad3..f19383cfbb4f 100644
--- a/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh
+++ b/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh
@@ -23,7 +23,6 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD$
 #
 
 usage_output='Usage: ctfconvert'
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index d7ddd45d9778..23ded7458bed 100644
--- a/cddl/usr.bin/ctfdump/Makefile
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -1,8 +1,7 @@
-# $FreeBSD$
-
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
 
+PACKAGE=	ctf-tools
 PROG=		ctfdump
 SRCS=		dump.c \
 		symbol.c \
diff --git a/cddl/usr.bin/ctfdump/Makefile.depend b/cddl/usr.bin/ctfdump/Makefile.depend
index ceebc6a83a34..edb476e399d9 100644
--- a/cddl/usr.bin/ctfdump/Makefile.depend
+++ b/cddl/usr.bin/ctfdump/Makefile.depend
@@ -1,8 +1,6 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/cddl/usr.bin/ctfdump/ctfdump.1 b/cddl/usr.bin/ctfdump/ctfdump.1
index 68764d11b0f9..27dfe6563645 100644
--- a/cddl/usr.bin/ctfdump/ctfdump.1
+++ b/cddl/usr.bin/ctfdump/ctfdump.1
@@ -26,8 +26,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 .\" SUCH DAMAGE. 
 .\"
-.\" $FreeBSD$
-.\"
 .Dd April 21, 2022
 .Dt CTFDUMP 1
 .Os
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index e9c8e505ed76..4cd9511f911c 100644
--- a/cddl/usr.bin/ctfmerge/Makefile
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -1,8 +1,7 @@
-# $FreeBSD$
-
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
 
+PACKAGE=	ctf-tools
 PROG=		ctfmerge
 SRCS=		alist.c \
 		barrier.c \
diff --git a/cddl/usr.bin/ctfmerge/Makefile.depend b/cddl/usr.bin/ctfmerge/Makefile.depend
index 32a1985bd180..e724f22559ff 100644
--- a/cddl/usr.bin/ctfmerge/Makefile.depend
+++ b/cddl/usr.bin/ctfmerge/Makefile.depend
@@ -1,8 +1,7 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
+	cddl/lib/libspl \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1
index b84bd8c84ead..2bc70db82dc9 100644
--- a/cddl/usr.bin/ctfmerge/ctfmerge.1
+++ b/cddl/usr.bin/ctfmerge/ctfmerge.1
@@ -26,8 +26,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 .\" SUCH DAMAGE. 
 .\"
-.\" $FreeBSD$
-.\"
 .Dd April 21, 2022
 .Dt CTFMERGE 1
 .Os
diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile
index 3b3078f8612a..29b1b564beca 100644
--- a/cddl/usr.bin/tests/Makefile
+++ b/cddl/usr.bin/tests/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
diff --git a/cddl/usr.bin/tests/Makefile.depend b/cddl/usr.bin/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.bin/tests/Makefile.depend
+++ b/cddl/usr.bin/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index fcc472c24214..921d4df7a651 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -1,10 +1,9 @@
-# $FreeBSD$
-
 ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
 
 .PATH: ${ZFSTOP}/cmd/zinject
 .PATH: ${ZFSTOP}/man/man8
 
+PACKAGE=	zfs
 PROG=	zinject
 INCS=	zinject.h
 SRCS=	zinject.c translate.c
@@ -16,6 +15,7 @@ CFLAGS+= \
 	-I${ZFSTOP}/include \
 	-I${ZFSTOP}/lib/libspl/include \
 	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
+	-I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
 	-I${SRCTOP}/sys \
 	-I${SRCTOP}/cddl/compat/opensolaris/include \
 	-I${ZFSTOP}/module/icp/include \
diff --git a/cddl/usr.bin/zinject/Makefile.depend b/cddl/usr.bin/zinject/Makefile.depend
index dfb2563fa7d1..c36e0e5ad2e7 100644
--- a/cddl/usr.bin/zinject/Makefile.depend
+++ b/cddl/usr.bin/zinject/Makefile.depend
@@ -1,27 +1,21 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	cddl/lib/libavl \
 	cddl/lib/libnvpair \
+	cddl/lib/libspl \
 	cddl/lib/libumem \
 	cddl/lib/libuutil \
 	cddl/lib/libzfs \
 	cddl/lib/libzfs_core \
 	cddl/lib/libzpool \
-	gnu/lib/csu \
+	cddl/lib/libzutil \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libexpat \
 	lib/libgeom \
-	lib/libmd \
-	lib/libsbuf \
-	lib/libthr \
-	lib/libutil \
-	lib/libz \
 	lib/msun \
 
 
diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
index cfcff71a813f..b131901cb6a9 100644
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@ -1,28 +1,31 @@
-# $FreeBSD$
-
 ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
 
 .PATH: ${ZFSTOP}/cmd/zstream
 .PATH: ${ZFSTOP}/man/man8
 
+PACKAGE=	zfs
 PROG=	zstream
 MAN=	zstream.8
 MLINKS=	zstream.8 zstreamdump.8
 INCS=	zstream.h
 SRCS= \
 	zstream.c \
+	zstream_decompress.c \
 	zstream_dump.c \
+	zstream_recompress.c  \
 	zstream_redup.c \
 	zstream_token.c
 
-SYMLINKS=	${BINDIR}/zstream ${BINDIR}/zstreamdump
+SYMLINKS=	zstream ${BINDIR}/zstreamdump
 
 WARNS?=	2
 CFLAGS+= \
 	-DIN_BASE \
+	-DZFS_DEBUG \
 	-I${ZFSTOP}/include \
 	-I${ZFSTOP}/lib/libspl/include \
 	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
+	-I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
 	-I${SRCTOP}/sys \
 	-I${SRCTOP}/cddl/compat/opensolaris/include \
 	-I${ZFSTOP}/module/icp/include \
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 91118d13775d..ef4bd561b41a 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <src.opts.mk>
 
 ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
@@ -7,6 +5,7 @@ ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
 .PATH: ${ZFSTOP}/cmd
 .PATH: ${ZFSTOP}/man/man1
 
+PACKAGE=	zfs
 PROG=	ztest
 MAN=	ztest.1
 
@@ -16,6 +15,7 @@ CFLAGS+= \
 	-I${ZFSTOP}/include \
 	-I${ZFSTOP}/lib/libspl/include \
 	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
+	-I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
 	-I${SRCTOP}/cddl/compat/opensolaris/include \
 	-I${ZFSTOP}/module/icp/include \
 	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
diff --git a/cddl/usr.bin/ztest/Makefile.depend b/cddl/usr.bin/ztest/Makefile.depend
index dfb2563fa7d1..dd387951fe20 100644
--- a/cddl/usr.bin/ztest/Makefile.depend
+++ b/cddl/usr.bin/ztest/Makefile.depend
@@ -1,27 +1,23 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	cddl/lib/libavl \
+	cddl/lib/libicp \
 	cddl/lib/libnvpair \
+	cddl/lib/libspl \
 	cddl/lib/libumem \
 	cddl/lib/libuutil \
 	cddl/lib/libzfs \
 	cddl/lib/libzfs_core \
 	cddl/lib/libzpool \
-	gnu/lib/csu \
+	cddl/lib/libzutil \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libexpat \
 	lib/libgeom \
-	lib/libmd \
-	lib/libsbuf \
 	lib/libthr \
-	lib/libutil \
-	lib/libz \
 	lib/msun \
 
 
diff --git a/cddl/usr.bin/ztest/tests/Makefile b/cddl/usr.bin/ztest/tests/Makefile
index edf2a537dbe3..88bcfc3ccf72 100644
--- a/cddl/usr.bin/ztest/tests/Makefile
+++ b/cddl/usr.bin/ztest/tests/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 .include <bsd.own.mk>
 
 ATF_TESTS_SH+= ztest
diff --git a/cddl/usr.bin/ztest/tests/ztest.sh b/cddl/usr.bin/ztest/tests/ztest.sh
index 9945d1a45aa9..8bc377917992 100755
--- a/cddl/usr.bin/ztest/tests/ztest.sh
+++ b/cddl/usr.bin/ztest/tests/ztest.sh
@@ -1,6 +1,5 @@
 #
 # Test Case: ztest
-# $FreeBSD$
 #
 atf_test_case ztest
 ztest_head()