git: 61e59d4cab9f - main - sysutils/cbsd: the port had been updated to version 14.0.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Tue, 21 Nov 2023 12:57:49 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=61e59d4cab9f4d6b85f90fda45f18c1e34e7016e

commit 61e59d4cab9f4d6b85f90fda45f18c1e34e7016e
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-11-21 12:56:06 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-11-21 12:56:06 +0000

    sysutils/cbsd: the port had been updated to version 14.0.2
    
    While here, simplify installation recipe, convert absolute symlink
    to a relative one (per stage Q/A report), wrap overly long lines.
    
    Changes:        https://github.com/cbsd/cbsd/releases/tag/v14.0.2
    Submitted by:   maintainer
---
 sysutils/cbsd/Makefile  | 24 ++++++++++++------------
 sysutils/cbsd/distinfo  |  6 +++---
 sysutils/cbsd/pkg-plist | 26 +++++++++++++++-----------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index f07f53cf5bc8..f5e8244cb587 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	14.0.1
+DISTVERSION=	14.0.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
@@ -50,22 +50,22 @@ PLIST_SUB+=	FBSD=""
 .endif
 
 do-install:
-	@${ECHO} "Installing in ${CBSD_HOME}"
-	${MKDIR} ${STAGEDIR}${CBSD_HOME}
-	${CP} -a ${WRKSRC}/ ${STAGEDIR}${CBSD_HOME}
-	${INSTALL_PROGRAM} -s ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} -s ${WRKSRC}/misc/src/sipcalc/sipcalc \
-		${STAGEDIR}${PREFIX}/cbsd/misc/sipcalc
-	${RM} -rf ${STAGEDIR}${PREFIX}/cbsd/bin/cbsdsh \
+	@${ECHO_MSG} "Installing in ${CBSD_HOME}"
+	${CP} -a ${WRKSRC} ${STAGEDIR}${CBSD_HOME}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/misc/src/sipcalc/sipcalc \
+		${STAGEDIR}${PREFIX}/cbsd/misc
+	${RM} -r ${STAGEDIR}${PREFIX}/cbsd/bin/cbsdsh \
 		${STAGEDIR}${PREFIX}/cbsd/bin/src \
 		${STAGEDIR}${PREFIX}/cbsd/lib \
 		${STAGEDIR}${PREFIX}/cbsd/misc/src \
 		${STAGEDIR}${PREFIX}/cbsd/sbin/src \
 		${STAGEDIR}${PREFIX}/cbsd/tools/src
-	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
-
-post-install:
+	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 \
+		${STAGEDIR}${MANPREFIX}/man/man8
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig
-	@${LN} -sf ${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd
+	${RLN} ${STAGEDIR}${CBSD_HOME}/share/bsdconfig/cbsd \
+		${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd
 
 .include <bsd.port.mk>
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index d9b56b242d8b..c84f6eed38c3 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696896539
-SHA256 (cbsd-cbsd-14.0.1_GH0.tar.gz) = 930b23cd2f8fc2657a20a9e52d6b981d71384a1d75ffb880e33b3fec41313047
-SIZE (cbsd-cbsd-14.0.1_GH0.tar.gz) = 6542947
+TIMESTAMP = 1700519115
+SHA256 (cbsd-cbsd-14.0.2_GH0.tar.gz) = 0579ded6317dc73918e42e45690ea359599e2a3a3447fe8f93a2450943ca8220
+SIZE (cbsd-cbsd-14.0.2_GH0.tar.gz) = 6553147
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index e1f6fb1c6635..80cad62437c3 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -159,6 +159,7 @@ cbsd/etc/defaults/fetch_iso.conf
 cbsd/etc/defaults/forms_env.conf
 cbsd/etc/defaults/forms_export_vars.conf
 cbsd/etc/defaults/geli.conf
+cbsd/etc/defaults/get-profiles.conf
 cbsd/etc/defaults/global.conf
 cbsd/etc/defaults/helpers.conf
 cbsd/etc/defaults/jail-freebsd-cbsdpuppet.conf
@@ -221,7 +222,7 @@ cbsd/etc/defaults/vm-freebsd-FreeBSD-riscv64-13.2.conf
 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-14.0.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
@@ -233,13 +234,13 @@ cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-12.4.conf
 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-14.0.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-14.0.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
@@ -253,6 +254,7 @@ 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
 cbsd/etc/defaults/vm-linux-ArchLinux-x86-2023.conf
+cbsd/etc/defaults/vm-linux-BlackBox-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-CentOS-7-x86_64.conf
 cbsd/etc/defaults/vm-linux-CentOS-stream-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-CentOS-stream-9-x86_64.conf
@@ -263,9 +265,10 @@ 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
+cbsd/etc/defaults/vm-linux-Kali-2023-amd64.conf
+cbsd/etc/defaults/vm-linux-Manjaro-x86-2023.conf
 cbsd/etc/defaults/vm-linux-Mint-21.conf
-cbsd/etc/defaults/vm-linux-NixOS-22.conf
+cbsd/etc/defaults/vm-linux-NixOS-23.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
@@ -277,7 +280,7 @@ cbsd/etc/defaults/vm-linux-Starface-8.conf
 cbsd/etc/defaults/vm-linux-Tails-5.conf
 cbsd/etc/defaults/vm-linux-TinyCore-x86-14.conf
 cbsd/etc/defaults/vm-linux-TrueNAS-Scale-22.conf
-cbsd/etc/defaults/vm-linux-VoidLinux-2022-x86_64.conf
+cbsd/etc/defaults/vm-linux-VoidLinux-2023-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
@@ -289,9 +292,9 @@ 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
 cbsd/etc/defaults/vm-linux-cloud-Fedora-38-x86_64.conf
+cbsd/etc/defaults/vm-linux-cloud-Fedora-39-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-FreePBX-16-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-HomeAssistant-8.conf
 cbsd/etc/defaults/vm-linux-cloud-Kali-2022-amd64.conf
@@ -306,8 +309,9 @@ 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-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
 cbsd/etc/defaults/vm-linux-fedora-server-38-x86_64.conf
+cbsd/etc/defaults/vm-linux-fedora-server-39-x86_64.conf
+cbsd/etc/defaults/vm-linux-fedora-silverblue-39-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-opensuse-leap-15-x86.conf
@@ -315,16 +319,16 @@ cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-22.conf
 cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-23.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-22.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-23.conf
-cbsd/etc/defaults/vm-linux-vyos-1.4.conf
+cbsd/etc/defaults/vm-linux-vyos-1.5.conf
 cbsd/etc/defaults/vm-netbsd-cloud-netbsd-x86-9.conf
 cbsd/etc/defaults/vm-netbsd-x86-9.conf
 cbsd/etc/defaults/vm-openbsd-cloud-openbsd-x86-7.conf
-cbsd/etc/defaults/vm-openbsd-cloud-openbsd-x86-72.conf
+cbsd/etc/defaults/vm-openbsd-cloud-openbsd-x86-73.conf
 cbsd/etc/defaults/vm-openbsd-x86-7.conf
 cbsd/etc/defaults/vm-other-FreeDOS.conf
 cbsd/etc/defaults/vm-other-Haiku-r1.conf
 cbsd/etc/defaults/vm-other-Minoca.conf
-cbsd/etc/defaults/vm-other-OpenIndiana-2022.conf
+cbsd/etc/defaults/vm-other-OpenIndiana-2023.conf
 cbsd/etc/defaults/vm-other-ReactOS.conf
 cbsd/etc/defaults/vm-other-Redox-0.7.conf
 cbsd/etc/defaults/vm-other-SmartOS.conf