3 files changed, 26 insertions, 27 deletions

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 63319d35a232..28ea08df8ff2 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	13.2.6
+DISTVERSION=	14.0.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 1ac2ff533042..202761ecec8f 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693649932
-SHA256 (cbsd-cbsd-13.2.6_GH0.tar.gz) = 40370129281f653ab10d6813eaaa3a233a61b2bb31d2f19bb82964a1d4b98d8e
-SIZE (cbsd-cbsd-13.2.6_GH0.tar.gz) = 6545196
+TIMESTAMP = 1695546844
+SHA256 (cbsd-cbsd-14.0.0_GH0.tar.gz) = adb713996ca43478dce8c3d0cd64b5e54044d8def26a2da9e59b9c73e167d97c
+SIZE (cbsd-cbsd-14.0.0_GH0.tar.gz) = 6542673
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index 2477f6facf82..e1f6fb1c6635 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -100,9 +100,11 @@ 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.0
 cbsd/etc/defaults/FreeBSD-kernel-CBSD-amd64-14.1
+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.0
 cbsd/etc/defaults/FreeBSD-kernel-FIRE-amd64-14.1
+cbsd/etc/defaults/FreeBSD-kernel-FIRE-amd64-15
 cbsd/etc/defaults/FreeBSD-kernel-FIRE-amd64-15.0
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-13
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-13.0
@@ -131,6 +133,7 @@ cbsd/etc/defaults/FreeBSD-sources.conf
 cbsd/etc/defaults/FreeBSD-srvbrowser.conf
 cbsd/etc/defaults/FreeBSD-userlist.conf
 cbsd/etc/defaults/HardenedBSD-bases.conf
+cbsd/etc/defaults/Linux-bases.conf
 cbsd/etc/defaults/bclone.conf
 cbsd/etc/defaults/bexec.conf
 cbsd/etc/defaults/bhyve-default-default.conf
@@ -159,15 +162,13 @@ cbsd/etc/defaults/geli.conf
 cbsd/etc/defaults/global.conf
 cbsd/etc/defaults/helpers.conf
 cbsd/etc/defaults/jail-freebsd-cbsdpuppet.conf
-cbsd/etc/defaults/jail-freebsd-centos_7.conf
 cbsd/etc/defaults/jail-freebsd-debian_bookworm.conf
 cbsd/etc/defaults/jail-freebsd-debian_bullseye.conf
-cbsd/etc/defaults/jail-freebsd-debian_buster.conf
 cbsd/etc/defaults/jail-freebsd-default.conf
-cbsd/etc/defaults/jail-freebsd-kfreebsd-wheezy.conf
 cbsd/etc/defaults/jail-freebsd-puppet.conf
+cbsd/etc/defaults/jail-freebsd-rocky_8.conf
+cbsd/etc/defaults/jail-freebsd-rocky_9.conf
 cbsd/etc/defaults/jail-freebsd-trusted.conf
-cbsd/etc/defaults/jail-freebsd-ubuntu_focal.conf
 cbsd/etc/defaults/jail-freebsd-ubuntu_jammy.conf
 cbsd/etc/defaults/jail-freebsd-vnet.conf
 cbsd/etc/defaults/jail2iso.conf
@@ -210,7 +211,6 @@ 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-fio.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-aarch64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-arm64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-bsdinstall-jail.conf
@@ -222,6 +222,7 @@ cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-12.4.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.1.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.0-LATEST.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-15.0-LATEST.conf
 cbsd/etc/defaults/vm-freebsd-GhostBSD-x64-23.conf
 cbsd/etc/defaults/vm-freebsd-HardenedBSD-x64-13-STABLE.conf
 cbsd/etc/defaults/vm-freebsd-MidnightBSD-x64-3.conf
@@ -233,15 +234,18 @@ cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.0.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.1.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-14.conf
+cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-15.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-12.4.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.0.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.1.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.conf
+cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-15.conf
 cbsd/etc/defaults/vm-freebsd-cloud-GhostBSD-ufs-x64-22.conf
 cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-22-RELEASE-amd64-22.conf
 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-linux-AlmaLinux-9-x86_64.conf
@@ -256,6 +260,7 @@ cbsd/etc/defaults/vm-linux-ClearLinux-Server-x86_64.conf
 cbsd/etc/defaults/vm-linux-Debian-x86-10.conf
 cbsd/etc/defaults/vm-linux-Debian-x86-11.conf
 cbsd/etc/defaults/vm-linux-Debian-x86-12.conf
+cbsd/etc/defaults/vm-linux-Devuan-x86-5.conf
 cbsd/etc/defaults/vm-linux-EuroLinux-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-FreePBX-64bit-16.conf
 cbsd/etc/defaults/vm-linux-Kali-2022-amd64.conf
@@ -282,6 +287,7 @@ cbsd/etc/defaults/vm-linux-cloud-Debian-x86-10.conf
 cbsd/etc/defaults/vm-linux-cloud-Debian-x86-11.conf
 cbsd/etc/defaults/vm-linux-cloud-Debian-x86-12.conf
 cbsd/etc/defaults/vm-linux-cloud-Debian-x86-9.conf
+cbsd/etc/defaults/vm-linux-cloud-Devuan-x86-5.conf
 cbsd/etc/defaults/vm-linux-cloud-Euro-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Fedora-36-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Fedora-37-x86_64.conf
@@ -298,7 +304,6 @@ 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
 cbsd/etc/defaults/vm-linux-cloud-ubuntudesktop-amd64-22.04.conf
-cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-20.04.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-22.04.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-23.04.conf
 cbsd/etc/defaults/vm-linux-fedora-server-37-x86_64.conf
@@ -325,9 +330,9 @@ 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-plan9front.conf
-cbsd/etc/defaults/vm-windows-7_86x_64x.conf
 cbsd/etc/defaults/vm-windows-10_86x_64x.conf
 cbsd/etc/defaults/vm-windows-11_86x_64x.conf
+cbsd/etc/defaults/vm-windows-7_86x_64x.conf
 cbsd/etc/defaults/vnc.conf
 cbsd/etc/defaults/xen-default-default.conf
 cbsd/etc/defaults/xlogin.conf
@@ -581,18 +586,6 @@ cbsd/share/FreeBSD-filemin_13.txt.xz
 cbsd/share/FreeBSD-filemin_14.txt.xz
 cbsd/share/FreeBSD-filemin_15.txt.xz
 cbsd/share/FreeBSD-git_branches.conf
-cbsd/share/FreeBSD-jail-centos-7-skel/placeholder
-cbsd/share/FreeBSD-jail-centos-7-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-centos-7-system-skel/tests/00.check_distribution.sh
-cbsd/share/FreeBSD-jail-debian-bookworm-skel/placeholder
-cbsd/share/FreeBSD-jail-debian-bookworm-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-debian-bookworm-system-skel/tests/00.check_distribution.sh
-cbsd/share/FreeBSD-jail-debian-bullseye-skel/placeholder
-cbsd/share/FreeBSD-jail-debian-bullseye-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-debian-bullseye-system-skel/tests/00.check_distribution.sh
-cbsd/share/FreeBSD-jail-kfreebsd-wheezy-skel/placeholder
-cbsd/share/FreeBSD-jail-kfreebsd-wheezy-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-kfreebsd-wheezy-system-skel/tests/00.check_distribution.sh
 cbsd/share/FreeBSD-jail-puppet-skel/etc/crontab
 cbsd/share/FreeBSD-jail-puppet-skel/etc/group
 cbsd/share/FreeBSD-jail-puppet-skel/etc/login.conf
@@ -628,10 +621,6 @@ cbsd/share/FreeBSD-jail-skel/etc/rc.conf
 cbsd/share/FreeBSD-jail-skel/etc/spwd.db
 cbsd/share/FreeBSD-jail-skel/root/.bashrc
 cbsd/share/FreeBSD-jail-skel/root/.cshrc
-cbsd/share/FreeBSD-jail-ubuntu-focal-skel/placeholder
-cbsd/share/FreeBSD-jail-ubuntu-jammy-skel/placeholder
-cbsd/share/FreeBSD-jail-ubuntu-jammy-system-skel/fstab.local
-cbsd/share/FreeBSD-jail-ubuntu-jammy-system-skel/tests/00.check_distribution.sh
 cbsd/share/FreeBSD-jail-vnet-skel/etc/crontab
 cbsd/share/FreeBSD-jail-vnet-skel/etc/group
 cbsd/share/FreeBSD-jail-vnet-skel/etc/login.conf
@@ -653,6 +642,16 @@ cbsd/share/FreeBSD-microbhyve.txt.xz
 cbsd/share/FreeBSD-microjail.txt.xz
 cbsd/share/HardenedBSD-filebases_11.txt.xz
 cbsd/share/HardenedBSD-git_branches.conf
+cbsd/share/Linux-jail-debian-bookworm-system-skel/fstab.local
+cbsd/share/Linux-jail-debian-bookworm-system-skel/tests/00.check_distribution.sh
+cbsd/share/Linux-jail-debian-bullseye-system-skel/fstab.local
+cbsd/share/Linux-jail-debian-bullseye-system-skel/tests/00.check_distribution.sh
+cbsd/share/Linux-jail-rocky-8-system-skel/fstab.local
+cbsd/share/Linux-jail-rocky-8-system-skel/tests/00.check_distribution.sh
+cbsd/share/Linux-jail-rocky-9-system-skel/fstab.local
+cbsd/share/Linux-jail-rocky-9-system-skel/tests/00.check_distribution.sh
+cbsd/share/Linux-jail-ubuntu-jammy-system-skel/fstab.local
+cbsd/share/Linux-jail-ubuntu-jammy-system-skel/tests/00.check_distribution.sh
 cbsd/share/autocompletion/bash/CBSDCompletion.bash
 cbsd/share/autocompletion/zsh/_cbsd
 cbsd/share/bhyve-system-default/create.d/placeholder