zfs: world changes after 89f729dcc merge

Remove, unbind and obsolete libuutil and libtpool
Update zfs_configh and zfs_gitrev.h

share/mk/bsd.libnames.mk

@@ -163,7 +163,6 @@ LIBTERMCAP?=	${LIBDESTDIR}${LIBDIR_BASE}/libtermcap.a
 LIBTERMCAPW?=	${LIBDESTDIR}${LIBDIR_BASE}/libtermcapw.a
 LIBTERMLIB?=	"don't use LIBTERMLIB, use LIBTERMCAP"
 LIBTINFOW=	${LIBDESTDIR}${LIBDIR_BASE}/libtinfow.a
-LIBTPOOL?=	${LIBDESTDIR}${LIBDIR_BASE}/libtpool.a
 LIBUFS?=	${LIBDESTDIR}${LIBDIR_BASE}/libufs.a
 LIBUGIDFW?=	${LIBDESTDIR}${LIBDIR_BASE}/libugidfw.a
 LIBULOG?=	${LIBDESTDIR}${LIBDIR_BASE}/libulog.a
@@ -171,7 +170,6 @@ LIBUMEM?=	${LIBDESTDIR}${LIBDIR_BASE}/libumem.a
 LIBUSB?=	${LIBDESTDIR}${LIBDIR_BASE}/libusb.a
 LIBUSBHID?=	${LIBDESTDIR}${LIBDIR_BASE}/libusbhid.a
 LIBUTIL?=	${LIBDESTDIR}${LIBDIR_BASE}/libutil.a
-LIBUUTIL?=	${LIBDESTDIR}${LIBDIR_BASE}/libuutil.a
 LIBUVMEM?=	${LIBDESTDIR}${LIBDIR_BASE}/libuvmem.a
 LIBVERTO?=	${LIBDESTDIR}${LIBDIR_BASE}/libverto.a
 LIBVGL?=	${LIBDESTDIR}${LIBDIR_BASE}/libvgl.a

share/mk/src.libnames.mk

@@ -229,7 +229,6 @@ _LIBRARIES=	\
 		tacplus \
 		termcapw \
 		tinfow \
-		tpool \
 		ufs \
 		ugidfw \
 		ulog \
@@ -238,7 +237,6 @@ _LIBRARIES=	\
 		usbhid \
 		util \
 		uvmem \
-		uutil \
 		verto \
 		vmmapi \
 		wind \
@@ -454,7 +452,7 @@ _DP_opencsd=	cxxrt
 _DP_ctf=	spl z
 _DP_dtrace=	ctf elf proc pthread rtld_db xo
 _DP_xo=		util
-_DP_ztest=	geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp
+_DP_ztest=	geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs icp
 # The libc dependencies are not strictly needed but are defined to make the
 # assert happy.
 _DP_c=		compiler_rt sys
@@ -491,15 +489,13 @@ _DP_smb=	kiconv
 _DP_ulog=	md
 _DP_fifolog=	z
 _DP_ipf=	kvm
-_DP_tpool=	spl
-_DP_uutil=	avl spl
 _DP_uvmem=	pthread
-_DP_zfs=	md pthread rt umem util uutil m avl bsdxml crypto geom nvpair \
+_DP_zfs=	md pthread rt umem util m avl bsdxml crypto geom nvpair \
 	z zfs_core zutil
 _DP_zfsbootenv= zfs nvpair
 _DP_zfs_core=	nvpair spl zutil
 _DP_zpool=	md pthread z icp spl nvpair avl umem
-_DP_zutil=	avl geom m tpool
+_DP_zutil=	avl geom m
 _DP_be=		zfs spl nvpair zfsbootenv
 _DP_netmap=
 _DP_ifconfig=	m
@@ -787,7 +783,6 @@ LIBICP_RESCUE?=	${LIBICP_RESCUEDIR}/libicp_rescue${PIE_SUFFIX}.a
 LIBNVPAIRDIR=	${_LIB_OBJTOP}/cddl/lib/libnvpair
 LIBNVPAIR?=	${LIBNVPAIRDIR}/libnvpair${PIE_SUFFIX}.a
 LIBUMEMDIR=	${_LIB_OBJTOP}/cddl/lib/libumem
-LIBUUTILDIR=	${_LIB_OBJTOP}/cddl/lib/libuutil
 LIBZDBDIR=	${_LIB_OBJTOP}/cddl/lib/libzdb
 LIBZDB?=	${LIBZDBDIR}/libzdb${PIE_SUFFIX}.a
 LIBZFSDIR=	${_LIB_OBJTOP}/cddl/lib/libzfs
@@ -800,7 +795,6 @@ LIBZPOOLDIR=	${_LIB_OBJTOP}/cddl/lib/libzpool
 LIBZPOOL?=	${LIBZPOOLDIR}/libzpool${PIE_SUFFIX}.a
 LIBZUTILDIR=	${_LIB_OBJTOP}/cddl/lib/libzutil
 LIBZUTIL?=	${LIBZUTILDIR}/libzutil${PIE_SUFFIX}.a
-LIBTPOOLDIR=	${_LIB_OBJTOP}/cddl/lib/libtpool
 
 # OFED support
 LIBCXGB4DIR=	${_LIB_OBJTOP}/lib/ofed/libcxgb4