From 61ca69110f2676b7dd3c7ff8dea899615d341e1e Mon Sep 17 00:00:00 2001
From: Lexi Winter <ivy@FreeBSD.org>
Date: Tue, 23 Sep 2025 22:37:06 +0100
Subject: [PATCH] packages: Replace libbz2 package with a bzip2 package

Currently libbz2 is in the libbz2 package, while bzip2 itself is in
-utilities, which is inconsistent.  Move both the library and the
utility to a new -bzip2 package, and use LIB_PACKAGE to create a
separate -bzip2-lib package for runtime dependencies.

Add the bzip2 package to the minimal set, and since newsyslogd uses
bzip2 for logfile compression, add a dependency from there.

MFC after:	1 day
Reviewed by:	manu
Differential Revision:	https://reviews.freebsd.org/D52663
---
 UPDATING                            |  7 +++++++
 lib/libbz2/Makefile                 |  4 +++-
 release/packages/ucl/bzip2-all.ucl  | 12 ++++++++++++
 release/packages/ucl/libbz2-all.ucl |  5 -----
 release/packages/ucl/newsyslog.ucl  |  7 +++++++
 usr.bin/bzip2/Makefile              |  2 ++
 usr.bin/bzip2recover/Makefile       |  2 ++
 7 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 release/packages/ucl/bzip2-all.ucl
 delete mode 100644 release/packages/ucl/libbz2-all.ucl
 create mode 100644 release/packages/ucl/newsyslog.ucl

diff --git a/UPDATING b/UPDATING
index f6412666564..73d3eddc294 100644
--- a/UPDATING
+++ b/UPDATING
@@ -38,6 +38,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW:
 	FreeBSD-pmc package.  If you use these, you may want to install the
 	package.
 
+	The libbz2 package has been renamed to bzip2, and /usr/bin/bzip2 has
+	been moved to the new package.  If you have set-minimal installed,
+	the new package will be added automatically, otherwise you may want
+	to manually install it.
+
+	This only affects pkgbase users.
+
 20250918:
 	mandoc (including /usr/bin/man) has been moved to a new package,
 	FreeBSD-mandoc.  If you have the minimal set installed, this package
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index f7ea21b1a08..d773f202dd6 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -1,4 +1,6 @@
-PACKAGE=	lib${LIB}
+PACKAGE=	bzip2
+LIB_PACKAGE=
+
 BZ2DIR=	${SRCTOP}/contrib/bzip2
 .PATH: ${BZ2DIR}
 
diff --git a/release/packages/ucl/bzip2-all.ucl b/release/packages/ucl/bzip2-all.ucl
new file mode 100644
index 00000000000..5bf1ef0c70f
--- /dev/null
+++ b/release/packages/ucl/bzip2-all.ucl
@@ -0,0 +1,12 @@
+comment = "A block-sorting data compressor"
+
+desc = <<EOD
+bzip2 compresses data using the Burrows-Wheeler block sorting text compression
+algorithm, and Huffman coding.  Compression is generally considerably better
+than that achieved by more conventional LZ77/LZ78-based compressors, and
+approaches the performance of the PPM family of statistical compressors.
+EOD
+
+annotations {
+	set = "minimal,minimal-jail"
+}
diff --git a/release/packages/ucl/libbz2-all.ucl b/release/packages/ucl/libbz2-all.ucl
deleted file mode 100644
index c8141bcb1d1..00000000000
--- a/release/packages/ucl/libbz2-all.ucl
+++ /dev/null
@@ -1,5 +0,0 @@
-comment = "bzip2 compression library"
-desc = <<EOD
-libbz2 allows applications to compress and decompress data using the bzip2
-compression algorithm.
-EOD
diff --git a/release/packages/ucl/newsyslog.ucl b/release/packages/ucl/newsyslog.ucl
new file mode 100644
index 00000000000..b1dfa825373
--- /dev/null
+++ b/release/packages/ucl/newsyslog.ucl
@@ -0,0 +1,7 @@
+deps {
+	# newsyslog uses bzip2 to compress log files.
+	"bzip2" {
+		version = "${VERSION}"
+		origin = "base"
+	}
+}
diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile
index 99679cc00c4..b89f8bbb85a 100644
--- a/usr.bin/bzip2/Makefile
+++ b/usr.bin/bzip2/Makefile
@@ -1,3 +1,5 @@
+PACKAGE=	bzip2
+
 BZ2DIR=	${SRCTOP}/contrib/bzip2
 .PATH: ${BZ2DIR}
 
diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile
index 2b11d3a4569..b62cba37329 100644
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -1,3 +1,5 @@
+PACKAGE=	bzip2
+
 BZ2DIR=	${SRCTOP}/contrib/bzip2
 .PATH: ${BZ2DIR}