git: ec71059e737d - main - sysutils/bareos-*: Fix package and libbareossql.so linking issues

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Tue, 30 Dec 2025 10:02:08 UTC
The branch main has been updated by acm:

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

commit ec71059e737d030ff619cf3dc83f9339054b2718
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-12-30 09:58:44 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-12-30 09:58:44 +0000

    sysutils/bareos-*: Fix package and libbareossql.so linking issues
    
    - Bump PORTREVISION
    
    PR:             291996
    Reported by:    fluffy madpilot
---
 sysutils/bareos-client/Makefile  | 4 ++--
 sysutils/bareos-server/Makefile  | 6 ++++--
 sysutils/bareos-server/pkg-plist | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile
index 0fffa0c9483c..251e3d733b44 100644
--- a/sysutils/bareos-client/Makefile
+++ b/sysutils/bareos-client/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	bareos
 
-PORTREVISION=	0
-
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
 CONFLICTS=	bareos22-client bareos23-client bareos24-client
 
+USE_CXXSTD=	c++17
+
 WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bareos-fd
 
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index bfba09577cc5..b7f3555da226 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	25.0.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
@@ -26,10 +26,11 @@ LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libfmt.so:devel/libfmt \
 		libxxhash.so:devel/xxhash
 
-USES+=		cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \
+USES+=		cmake compiler:c++20-lang cpe localbase:ldflags perl5 pkgconfig readline \
 		shebangfix
 USE_GITHUB=	yes
 USE_PERL5=	run
+USE_CXXSTD?=	c++20
 
 USERS=		bareos
 GROUPS=		${USERS}
@@ -196,6 +197,7 @@ post-patch:
 .if ${PKGNAMESUFFIX} == "-client"
 	@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|enable_testing()||g' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|CMAKE_CXX_STANDARD 20|CMAKE_CXX_STANDARD 17|g' ${WRKSRC}/core/CMakeLists.txt
 .endif
 
 	@${REINPLACE_CMD} -e 's/CMAKE_INSTALL_FULL_DATAROOTDIR/CMAKE_INSTALL_DATAROOTDIR/g' \
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index a25118401adb..bacddd38e53d 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -43,6 +43,7 @@ bin/bwild
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/Dedupable.conf.sample
 %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
 etc/logrotate.d/bareos-dir
+etc/logrotate.d/bareos-mtx
 lib/bareos/backends/libbareossd-dedupable.so
 lib/bareos/backends/libbareossd-dplcompat.so
 lib/bareos/backends/libbareossd-fifo.so