Page MenuHomeFreeBSD

D52663.id162703.diff
No OneTemporary

D52663.id162703.diff

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -38,6 +38,13 @@
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
--- 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
--- /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
--- 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
--- /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
--- 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
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -1,3 +1,5 @@
+PACKAGE= bzip2
+
BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}

File Metadata

Mime Type
text/plain
Expires
Sat, May 30, 10:52 PM (9 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33640682
Default Alt Text
D52663.id162703.diff (2 KB)

Event Timeline