git: 848e10ca6a87 - main - sysutils/bareos-server: Update to 23.1.0

The branch main has been updated by madpilot:

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

commit 848e10ca6a87ad5520d4f130c24a44dd23301dd3
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-12-02 20:12:52 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2024-12-02 20:12:52 +0000

    sysutils/bareos-server: Update to 23.1.0
    
    - Fix build on recent releases [1]
    - Fix rc script REQUIRE substitutions
    - Remove unused %%REQ_MYSQL%% in rc script
    - Do not install new sample dedup.conf file because it is invalid
      and causes the director to fail to start as is.
    
    PR:             283052, 278948 [1]
    Approved by:    acm (maintainer)
---
 sysutils/bareos-server/Makefile            | 14 ++++++++++----
 sysutils/bareos-server/distinfo            |  6 +++---
 sysutils/bareos-server/files/bareos-dir.in |  2 +-
 sysutils/bareos-server/pkg-plist           |  3 +++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index 4f790610c6a7..4fd3dd5bc710 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	23.0.2
+DISTVERSION=	23.1.0
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
@@ -16,7 +16,8 @@ LICENSE_COMB=	multi
 CONFLICTS?=	bareos20-server bareos21-server bareos22-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
-		libjansson.so:devel/jansson
+		libjansson.so:devel/jansson \
+		libfmt.so:devel/libfmt
 
 USES+=		cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \
 		shebangfix
@@ -167,7 +168,9 @@ CMAKE_ARGS+=	-Dbuild-dird=ON \
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 PGSQL_CMAKE_ON=		-Dpostgresql=ON
-PGSQL_USES=	pgsql
+PGSQL_USES=		pgsql
+PGSQL_SUB_LIST=		REQ_PGSQL=postgresql
+PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
@@ -182,7 +185,7 @@ MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
 MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
-	@${REINPLACE_CMD}  '133,138d' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD}  '136,141d' ${WRKSRC}/CMakeLists.txt
 .if ${PKGNAMESUFFIX} == "-server"
 	@${REINPLACE_CMD}  '50d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
 .endif
@@ -190,6 +193,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
 .endif
 
+post-patch-PYTHON-off:
+	@${REINPLACE_CMD} 's/set(python ON)/set(python OFF)/' ${WRKSRC}/cmake/BareosSetVariableDefaults.cmake
+
 post-extract:
 .if defined(WITH_CLIENT_ONLY)
 .	if defined(PYTHON_PLUGIN)
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index 51e0b1d2f9d6..52244486359d 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714631763
-SHA256 (bareos-bareos-Release-23.0.2_GH0.tar.gz) = 88df0b281d0c23c4991e227126b2df263f13a89329aaaaa67e84e804cafc793c
-SIZE (bareos-bareos-Release-23.0.2_GH0.tar.gz) = 14724410
+TIMESTAMP = 1732913559
+SHA256 (bareos-bareos-Release-23.1.0_GH0.tar.gz) = 8a4ae832317de4c160deaf378fa783ab3e259c92b16e961f93fc8d0ffbb59d5a
+SIZE (bareos-bareos-Release-23.1.0_GH0.tar.gz) = 14002357
diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in
index 22272cf86231..658865b50b67 100644
--- a/sysutils/bareos-server/files/bareos-dir.in
+++ b/sysutils/bareos-server/files/bareos-dir.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: bareos_dir
-# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
+# REQUIRE: DAEMON %%REQ_PGSQL%%
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index fa172534f55e..f9470ede3232 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -29,6 +29,7 @@ bin/bwild
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
+%%ETCDIR%%/bareos-dir.d/storage/dedup.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
 %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample
@@ -43,8 +44,10 @@ bin/bwild
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/dedup.conf.sample
 %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
 etc/logrotate.d/bareos-dir
+lib/bareos/backends/libbareossd-dedupable.so
 lib/bareos/backends/libbareossd-fifo.so
 lib/bareos/backends/libbareossd-file.so
 %%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so