sysutils/cbsd: Update to 13.1.2

Changes: https://github.com/cbsd/cbsd/releases/tag/v13.1.2

3 files changed, 24 insertions, 13 deletions

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 04d0c40505ad..6702f996e007 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	13.1.1
+DISTVERSION=	13.1.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
@@ -30,12 +30,20 @@ CBSD_HOME?=	${PREFIX}/cbsd
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == amd64 || ${ARCH} == i386
+.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == x86_64
 PLIST_SUB=	X86=""
 .else
 PLIST_SUB=	X86="@comment "
 .endif
 
+.if ${OPSYS} != FreeBSD
+PLIST_SUB+=	FBSD="@comment "
+LIB_DEPENDS+=	libelf.so:devel/libelf
+RUN_DEPENDS+=	sysrc:sysutils/sysrc
+.else
+PLIST_SUB+=	FBSD=""
+.endif
+
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 6cf116410211..cc63372763db 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655721512
-SHA256 (cbsd-cbsd-13.1.1_GH0.tar.gz) = e00af0ae9c29ea15b02511552bb9433252e14fa52165dd9db9132395fd0ff518
-SIZE (cbsd-cbsd-13.1.1_GH0.tar.gz) = 5590396
+TIMESTAMP = 1657574754
+SHA256 (cbsd-cbsd-13.1.2_GH0.tar.gz) = b05af78c253741f8ae1723a80f314d6547803573116d320574bb921b654f8da8
+SIZE (cbsd-cbsd-13.1.2_GH0.tar.gz) = 5592737
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index 68383b2d6045..37b58cbfdbdb 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -208,6 +208,7 @@ cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.conf
 cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-22-RELEASE-amd64-22.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
 cbsd/etc/defaults/vm-linux-Alpine-extended-3.conf
 cbsd/etc/defaults/vm-linux-Alpine-standart-3.conf
 cbsd/etc/defaults/vm-linux-Android-x86.conf
@@ -218,17 +219,18 @@ 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-10.conf
 cbsd/etc/defaults/vm-linux-Debian-x86-11.conf
-cbsd/etc/defaults/vm-linux-Debian-x86-9-minimal.conf
-cbsd/etc/defaults/vm-linux-Debian-x86-9.conf
 cbsd/etc/defaults/vm-linux-FreePBX-64bit-16.conf
 cbsd/etc/defaults/vm-linux-Kali-2022-amd64.conf
 cbsd/etc/defaults/vm-linux-Mint-20.conf
 cbsd/etc/defaults/vm-linux-OracleLinux-7.conf
 cbsd/etc/defaults/vm-linux-OracleLinux-8.conf
+cbsd/etc/defaults/vm-linux-OracleLinux-9.conf
 cbsd/etc/defaults/vm-linux-Parrot-security-5-x64.conf
+cbsd/etc/defaults/vm-linux-Starface-7.conf
 cbsd/etc/defaults/vm-linux-Rocky-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-TinyCore-x86-13.conf
 cbsd/etc/defaults/vm-linux-TrueNAS-Scale-22.conf
+cbsd/etc/defaults/vm-linux-cloud-Alma-9-x86_64.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
@@ -241,6 +243,7 @@ cbsd/etc/defaults/vm-linux-cloud-HomeAssistant-8.conf
 cbsd/etc/defaults/vm-linux-cloud-Kali-2022-amd64.conf
 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-Rocky-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-kubernetes-24.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntudesktop-amd64-22.04.conf
@@ -345,7 +348,7 @@ cbsd/misc/fmagic
 cbsd/misc/ipv6range
 cbsd/misc/mtree
 cbsd/misc/next-ng-port
-cbsd/misc/next-vale-port
+%%FBSD%%cbsd/misc/next-vale-port
 cbsd/misc/nics-list
 cbsd/misc/pwcrypt
 cbsd/misc/resolv
@@ -938,7 +941,7 @@ cbsd/tools/bhyve-p9shares
 cbsd/tools/bhyve-ppt
 cbsd/tools/bootmgmt
 cbsd/tools/bootmgmt-pxe
-cbsd/tools/bridge
+%%FBSD%%cbsd/tools/bridge
 cbsd/tools/carpcfg
 cbsd/tools/carpcontrol
 cbsd/tools/cbsdchown
@@ -1015,9 +1018,9 @@ cbsd/tools/path2jail
 cbsd/tools/pkgbrowsecat
 cbsd/tools/pkgbrowser
 cbsd/tools/pull
-cbsd/tools/racct-bhyve-statsd
-cbsd/tools/racct-hoster-statsd
-cbsd/tools/racct-jail-statsd
+%%FBSD%%cbsd/tools/racct-bhyve-statsd
+%%FBSD%%cbsd/tools/racct-hoster-statsd
+%%FBSD%%cbsd/tools/racct-jail-statsd
 cbsd/tools/rctlcounters
 cbsd/tools/replacewdir
 cbsd/tools/repo
@@ -1042,7 +1045,7 @@ cbsd/tools/trafstat
 cbsd/tools/unmountfstab
 cbsd/tools/unmountmd
 cbsd/tools/up
-cbsd/tools/vale-ctl
+%%FBSD%%cbsd/tools/vale-ctl
 cbsd/tools/valecfg
 cbsd/tools/valecfg-tui
 cbsd/tools/vhidcfg