git: f9513c334ff7 - main - add packages for libufs, libzfs

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=f9513c334ff7d3ccdebfcb90f015890963768e0d

commit f9513c334ff7d3ccdebfcb90f015890963768e0d
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-05-05 15:23:54 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-05-05 15:39:25 +0000

    add packages for libufs, libzfs
    
    currently FreeBSD-utilities depends on both FreeBSD-ufs and FreeBSD-zfs.
    this is not desirable, because those are both relatively large packages
    and the user may want to remove one or the other – or perhaps both, e.g.
    in a jail or embedded system.
    
    the reason for this dependency is that fstyp(8), which is in
    FreeBSD-utilities, links both libufs and libzfs.  FreeBSD-utilities is
    the correct place for fstyp, so we don't want to move that.
    
    instead, add two new packages: libufs contains libufs, and libzfs
    contains libzfs plus the ZFS libraries it depends on: libavl, libnvpair,
    libspl, libtpool, libumem, libuutil, libzfs_core and libzutil.
    
    with this change, it is possible to remove FreeBSD-ufs and/or
    FreeBSD-zfs while leaving FreeBSD-libufs, FreeBSD-libzfs and
    FreeBSD-utilities installed.
    
    Reviewed by:    manu, des
    Approved by:    des (mentor)
    Differential Revision:  https://reviews.freebsd.org/D50148
---
 cddl/lib/libavl/Makefile      | 2 +-
 cddl/lib/libnvpair/Makefile   | 2 +-
 cddl/lib/libspl/Makefile      | 2 +-
 cddl/lib/libtpool/Makefile    | 2 +-
 cddl/lib/libumem/Makefile     | 2 +-
 cddl/lib/libuutil/Makefile    | 2 +-
 cddl/lib/libzfs/Makefile      | 2 +-
 cddl/lib/libzfs_core/Makefile | 2 +-
 cddl/lib/libzutil/Makefile    | 2 +-
 lib/libufs/Makefile           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index c816f07df223..ce77012def9f 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,6 +1,6 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	avl
 LIBADD=	spl
 SRCS=	avl.c
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 9ae081b7a96e..2d9ef1c7af1e 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -5,7 +5,7 @@
 LIB=	nvpair
 LIBADD=	spl
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 # user
 INCS=	libnvpair.h
 SRCS=	libnvpair.c \
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index efeba68e4f03..d44e5cb19ab4 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -6,7 +6,7 @@
 
 LIB=	spl
 LIBADD=
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 SRCS = \
         assert.c \
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 94b29c9ae72d..2afaf0c417e9 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -4,7 +4,7 @@
 
 LIB=	tpool
 LIBADD=	spl
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 INCS=	thread_pool_impl.h
 SRCS=	thread_pool.c
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index f955e306c62c..9164ba771fe6 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,6 +1,6 @@
 .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	umem
 SRCS=	umem.c
 WARNS?=	3
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 547078504103..8c8a786ee039 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,6 +1,6 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	uutil
 SRCS=\
 	uu_alloc.c \
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index bb0127a9108a..40553aa68719 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,7 +7,7 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	zfs
 LIBADD= \
 	avl \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index d986c45725b3..8ce0a152852f 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -6,7 +6,7 @@
 
 LIB=	zfs_core
 LIBADD=	nvpair spl zutil
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 INCS=	libzfs_core.h
 SRCS=	libzfs_core.c \
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index d1a943b25005..07ca3b9bc156 100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -4,7 +4,7 @@
 
 LIB=	zutil
 LIBADD=	avl geom m tpool
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 INCS = zutil_import.h
 
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index 12c742e6b871..ab913f834bb3 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,4 +1,4 @@
-PACKAGE=	ufs
+PACKAGE=	libufs
 LIB=	ufs
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	8