sysutils/cbsd: Update to 14.2.0

Changes: https://github.com/cbsd/cbsd/releases/tag/v14.2.0

8 files changed, 26 insertions, 28 deletions

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index f1b580c023d8..bebd9c86b4b8 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	14.1.4
+DISTVERSION=	14.2.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
@@ -30,10 +30,6 @@ SUB_FILES=	pkg-message
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
-OPTIONS_DEFINE=	BHYVE_GOP
-OPTIONS_SUB=	yes
-BHYVE_GOP_DESC=	Include bhyve UEFI firmware with GPU PPT+GOP support
-
 CBSD_HOME?=	${PREFIX}/cbsd
 
 .include <bsd.port.options.mk>
@@ -47,7 +43,6 @@ PLIST_SUB+=	X86="@comment "
 .if ${OPSYS} != FreeBSD
 PLIST_SUB+=	FBSD="@comment "
 LIB_DEPENDS+=	libelf.so:devel/libelf
-RUN_DEPENDS+=	sysrc:sysutils/sysrc
 .else
 PLIST_SUB+=	FBSD=""
 .endif
@@ -67,6 +62,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/cbsd/misc/src \
 		${STAGEDIR}${PREFIX}/cbsd/sbin/src \
 		${STAGEDIR}${PREFIX}/cbsd/tools/src
+	${RM} -rf ${STAGEDIR}${PREFIX}/cbsd/share/docs
 	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 \
 		${STAGEDIR}${PREFIX}/share/man/man8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 5e925cd85049..6f0ffdb10d17 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730488448
-SHA256 (cbsd-cbsd-14.1.4_GH0.tar.gz) = 977d5f773cf86451734b3a37fcb416df26e225bacedd47ab195c8a20daa2a855
-SIZE (cbsd-cbsd-14.1.4_GH0.tar.gz) = 7203417
+TIMESTAMP = 1733251216
+SHA256 (cbsd-cbsd-14.2.0_GH0.tar.gz) = 5a647c36ecc5c076d68220ef317e14ea52667e01f8b536050a9f9b4614479788
+SIZE (cbsd-cbsd-14.2.0_GH0.tar.gz) = 7342035
diff --git a/sysutils/cbsd/files/cbsd-statsd-bhyve.in b/sysutils/cbsd/files/cbsd-statsd-bhyve.in
index 14de0265d510..95edce940095 100644
--- a/sysutils/cbsd/files/cbsd-statsd-bhyve.in
+++ b/sysutils/cbsd/files/cbsd-statsd-bhyve.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # PROVIDE: cbsd_statsd_bhyve
-# REQUIRE: LOGIN FILESYSTEMS sshd
+# REQUIRE: LOGIN FILESYSTEMS cbsdd
 # KEYWORD: shutdown
 #
 # cbsd_statsd_bhyve_enable="YES"
diff --git a/sysutils/cbsd/files/cbsd-statsd-hoster.in b/sysutils/cbsd/files/cbsd-statsd-hoster.in
index a8aa94a8d3c0..1fbea3fe6e67 100644
--- a/sysutils/cbsd/files/cbsd-statsd-hoster.in
+++ b/sysutils/cbsd/files/cbsd-statsd-hoster.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # PROVIDE: cbsd_statsd_hoster
-# REQUIRE: LOGIN FILESYSTEMS sshd
+# REQUIRE: LOGIN FILESYSTEMS cbsdd
 # KEYWORD: shutdown
 #
 # cbsd_statsd_hoster_enable="YES"
diff --git a/sysutils/cbsd/files/cbsd-statsd-jail.in b/sysutils/cbsd/files/cbsd-statsd-jail.in
index 6c529ce1c0b9..ab87b8ef6f6c 100644
--- a/sysutils/cbsd/files/cbsd-statsd-jail.in
+++ b/sysutils/cbsd/files/cbsd-statsd-jail.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # PROVIDE: cbsd_statsd_jail
-# REQUIRE: LOGIN FILESYSTEMS sshd
+# REQUIRE: LOGIN FILESYSTEMS cbsdd
 # KEYWORD: shutdown
 #
 # cbsd_statsd_jail_enable="YES"
diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index cbde5558a692..f4e7b4c8d00e 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # PROVIDE: cbsdd
-# REQUIRE: LOGIN FILESYSTEMS sshd
+# REQUIRE: LOGIN FILESYSTEMS cleanvar sshd
 # KEYWORD: shutdown
 #
 # cbsdd_enable="YES"
diff --git a/sysutils/cbsd/pkg-descr b/sysutils/cbsd/pkg-descr
index be0ac698d1e8..b36a1391b4b3 100644
--- a/sysutils/cbsd/pkg-descr
+++ b/sysutils/cbsd/pkg-descr
@@ -1 +1,2 @@
-Yet another FreeBSD jail and bhyve management tool.
+CBSD is a cross-platform wrapper for fast deployment of
+virtual machines and containers.
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index e7010a2796e3..7531d62767c5 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -6,7 +6,6 @@ bin/cbsd
 @group
 @mode
 share/man/man8/cbsd.8.gz
-%%BHYVE_GOP%%cbsd/upgrade/patch/efigop.fd
 %%FBSD%%cbsd/misc/next-vale-port
 %%FBSD%%cbsd/tools/bridge
 %%FBSD%%cbsd/tools/racct-bhyve-statsd
@@ -96,6 +95,8 @@ cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-13.2
 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-13.3
 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-14
 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-14.1
+cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-14.2
+cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-14.3
 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-15
 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-15.0
 cbsd/etc/defaults/FreeBSD-kernel-FIRE-amd64-14.1
@@ -208,14 +209,15 @@ cbsd/etc/defaults/virtualbox-default-default.conf
 cbsd/etc/defaults/vls.conf
 cbsd/etc/defaults/vm-dflybsd-cloud-DragonflyBSD-hammer-x64-6.conf
 cbsd/etc/defaults/vm-dflybsd-x86-6.conf
-cbsd/etc/defaults/vm-freebsd-FreeBSD-aarch64-14.1.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-aarch64-14.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-bsdinstall-jail.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-from-jail.conf
-cbsd/etc/defaults/vm-freebsd-FreeBSD-img-aarch64-13.3.conf
-cbsd/etc/defaults/vm-freebsd-FreeBSD-img-arm64-13.3.conf
-cbsd/etc/defaults/vm-freebsd-FreeBSD-riscv64-14.1.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-img-aarch64-14.2.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-img-arm64-14.2.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-riscv64-14.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.4.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.1.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-15.0-LATEST.conf
 cbsd/etc/defaults/vm-freebsd-GhostBSD-x64-24.conf
 cbsd/etc/defaults/vm-freebsd-HardenedBSD-x64-14-STABLE.conf
@@ -227,11 +229,13 @@ cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.3.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.4.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-14.1.conf
+cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-14.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-15.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.3.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.4.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.1.conf
+cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-15.conf
 cbsd/etc/defaults/vm-freebsd-cloud-GhostBSD-zfs-x64-24.conf
 cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-22-RELEASE-amd64-22.conf
@@ -239,7 +243,6 @@ cbsd/etc/defaults/vm-freebsd-cloud-XigmaNAS-13-amd64.conf
 cbsd/etc/defaults/vm-freebsd-cloud-firestarter-ufs-x64-14.conf
 cbsd/etc/defaults/vm-freebsd-fio.conf
 cbsd/etc/defaults/vm-freebsd-helloSystem-x64.conf
-cbsd/etc/defaults/vm-freebsd-pfSense-2-RELEASE-amd64.conf
 cbsd/etc/defaults/vm-freebsd-ravynOS-x64-24.conf
 cbsd/etc/defaults/vm-linux-AlmaLinux-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-Alpine-extended-3.conf
@@ -247,13 +250,10 @@ cbsd/etc/defaults/vm-linux-Alpine-standart-3.conf
 cbsd/etc/defaults/vm-linux-AltLinux-10.conf
 cbsd/etc/defaults/vm-linux-AltLinux-kworkstation-10.conf
 cbsd/etc/defaults/vm-linux-AltVirt-10.conf
-cbsd/etc/defaults/vm-linux-Android-x86.conf
 cbsd/etc/defaults/vm-linux-ArchLinux-x86-2024.conf
 cbsd/etc/defaults/vm-linux-Batocera.conf
-cbsd/etc/defaults/vm-linux-BlackBox-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-BlackBox-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-BlissOS-x86.conf
-cbsd/etc/defaults/vm-linux-CentOS-7-x86_64.conf
 cbsd/etc/defaults/vm-linux-CentOS-stream-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-ClearLinux-Server-x86_64.conf
 cbsd/etc/defaults/vm-linux-Debian-x86-11.conf
@@ -277,6 +277,7 @@ cbsd/etc/defaults/vm-linux-Rocky-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-RouterOS-x86-7.conf
 cbsd/etc/defaults/vm-linux-Slackware-x86-15.conf
 cbsd/etc/defaults/vm-linux-Starface-8.conf
+cbsd/etc/defaults/vm-linux-Starface-9.conf
 cbsd/etc/defaults/vm-linux-Tails-6.conf
 cbsd/etc/defaults/vm-linux-TinyCore-x86-15.conf
 cbsd/etc/defaults/vm-linux-TrueNAS-Scale-24.conf
@@ -284,7 +285,6 @@ cbsd/etc/defaults/vm-linux-VoidLinux-2024-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Alma-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Arch-x86-2022.conf
 cbsd/etc/defaults/vm-linux-cloud-CentOS-7-x86_64.conf
-cbsd/etc/defaults/vm-linux-cloud-CentOS-stream-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-CentOS-stream-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Debian-x86-10.conf
 cbsd/etc/defaults/vm-linux-cloud-Debian-x86-11.conf
@@ -303,7 +303,6 @@ cbsd/etc/defaults/vm-linux-cloud-Oracle-7-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Oracle-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Oracle-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Parrot-5-amd64.conf
-cbsd/etc/defaults/vm-linux-cloud-Rocky-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Rocky-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-firestarter-debian-11.conf
 cbsd/etc/defaults/vm-linux-cloud-kubernetes-27.conf
@@ -317,7 +316,6 @@ cbsd/etc/defaults/vm-linux-fedora-server-40-x86_64.conf
 cbsd/etc/defaults/vm-linux-fedora-server-41-x86_64.conf
 cbsd/etc/defaults/vm-linux-fedora-silverblue-40-x86_64.conf
 cbsd/etc/defaults/vm-linux-kubuntu-desktop-amd64-22.conf
-cbsd/etc/defaults/vm-linux-kubuntu-desktop-amd64-23.conf
 cbsd/etc/defaults/vm-linux-kubuntu-desktop-amd64-24.conf
 cbsd/etc/defaults/vm-linux-lubuntu-desktop-amd64-22.conf
 cbsd/etc/defaults/vm-linux-lubuntu-desktop-amd64-24.conf
@@ -328,7 +326,6 @@ cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-23.conf
 cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-24.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-20.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-22.conf
-cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-23.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-24.conf
 cbsd/etc/defaults/vm-linux-vyos-1.5.conf
 cbsd/etc/defaults/vm-netbsd-cloud-netbsd-x86-10.conf
@@ -345,7 +342,7 @@ cbsd/etc/defaults/vm-other-OpenIndiana-2024.conf
 cbsd/etc/defaults/vm-other-ReactOS.conf
 cbsd/etc/defaults/vm-other-Redox-0.7.conf
 cbsd/etc/defaults/vm-other-SmartOS.conf
-cbsd/etc/defaults/vm-other-omnios-2023.conf
+cbsd/etc/defaults/vm-other-omnios-2025.conf
 cbsd/etc/defaults/vm-other-plan9front.conf
 cbsd/etc/defaults/vm-windows-10_86x_64x.conf
 cbsd/etc/defaults/vm-windows-11_86x_64x.conf
@@ -1087,6 +1084,7 @@ cbsd/tools/bhyve-p9shares
 cbsd/tools/bhyve-ppt
 cbsd/tools/bootmgmt
 cbsd/tools/bootmgmt-pxe
+cbsd/tools/buildah
 cbsd/tools/capabilities
 cbsd/tools/carpcfg
 cbsd/tools/carpcontrol
@@ -1210,6 +1208,7 @@ cbsd/upgrade/backup_db/pre-initenv-backup
 cbsd/upgrade/patch/BHYVE_UEFI_VARS.fd
 cbsd/upgrade/patch/bhyve-vesa-fb-13.0/patch-13x-usr.sbin-bhyve-pci_fbuf.c
 cbsd/upgrade/patch/efi.fd
+cbsd/upgrade/patch/efigop.fd
 cbsd/upgrade/patch/efirefd.fd
 cbsd/upgrade/patch/efirefn.fd
 cbsd/upgrade/patch/iov-13.0/README.md
@@ -1352,6 +1351,8 @@ cbsd/upgrade/pre-patch-14.1.0.0
 cbsd/upgrade/pre-patch-14.1.1.0
 cbsd/upgrade/pre-patch-14.1.3.0
 cbsd/upgrade/pre-patch-14.1.3.1
+cbsd/upgrade/pre-patch-14.2.0.0
+cbsd/upgrade/pre-patch-14.2.0.1
 cbsd/vboxctl/vconfig
 cbsd/vboxctl/vconstruct-tui
 cbsd/vboxctl/vcontrol-tui