cleanup: Remove expired ports:

2025-01-21 sysutils/bareos21-client: not supported upstream
2025-01-21 sysutils/bareos21-server: not supported upstream

34 files changed, 2 insertions, 1673 deletions

diff --git a/MOVED b/MOVED
index e499d4b41a97..871893e1369d 100644
--- a/MOVED
+++ b/MOVED
@@ -4037,3 +4037,5 @@ www/bareos21-webui||2025-01-21|Has expired: not supported upstream
 sysutils/bareos20-traymonitor||2025-01-21|Has expired: not supported upstream
 sysutils/bareos20-client||2025-01-21|Has expired: not supported upstream
 sysutils/bareos20-server||2025-01-21|Has expired: not supported upstream
+sysutils/bareos21-client||2025-01-21|Has expired: not supported upstream
+sysutils/bareos21-server||2025-01-21|Has expired: not supported upstream
diff --git a/sysutils/Makefile b/sysutils/Makefile
index dd713ebca07f..ea6c85907285 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -99,8 +99,6 @@
     SUBDIR += bareos-client
     SUBDIR += bareos-server
     SUBDIR += bareos-traymonitor
-    SUBDIR += bareos21-client
-    SUBDIR += bareos21-server
     SUBDIR += bareos22-client
     SUBDIR += bareos22-server
     SUBDIR += bareos22-traymonitor
diff --git a/sysutils/bareos21-client/Makefile b/sysutils/bareos21-client/Makefile
deleted file mode 100644
index 0b96d1f4709c..000000000000
--- a/sysutils/bareos21-client/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-PORTNAME=	bareos
-PKGNAMESUFFIX=	21-client
-
-COMMENT=	Backup archiving recovery open sourced (client)
-
-CONFLICTS=	bareos20-client bareos19-client bareos18-client
-
-WITH_CLIENT_ONLY=yes
-USE_RC_SUBR=	bareos-fd
-
-PLIST=		${PKGDIR}/pkg-plist.client
-MASTERDIR=	${.CURDIR}/../../sysutils/bareos21-server
-
-OPTIONS_GROUP=	PLUGINS
-OPTIONS_GROUP_PLUGINS=	CEPHFS GFAPI RADOS
-OPTIONS_DEFINE=	NLS PYTHON SCSICRYPTO
-
-CEPHFS_DESC=	CEPHFS fd plugin support
-GFAPI_DESC=	GFAPI fd plugin support
-RADOS_DESC=	RADOS fd plugin support
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos21-server/Makefile b/sysutils/bareos21-server/Makefile
deleted file mode 100644
index f75ea1c8f78f..000000000000
--- a/sysutils/bareos21-server/Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-PORTNAME=	bareos
-DISTVERSIONPREFIX=	Release/
-DISTVERSION=	21.1.9
-PORTREVISION?=	1
-CATEGORIES?=	sysutils
-PKGNAMEPREFIX?=	#
-PKGNAMESUFFIX?=	21-server
-
-MAINTAINER=	acm@FreeBSD.org
-COMMENT?=	Backup archiving recovery open sourced (server)
-WWW=		https://www.bareos.org/
-
-LICENSE=	AGPLv3 LGPL3
-LICENSE_COMB=	multi
-
-DEPRECATED=	not supported upstream
-EXPIRATION_DATE=	2025-01-21
-
-CONFLICTS?=	bareos-server bareos20-server bareos19-server bareos18-server
-
-LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
-		libjansson.so:devel/jansson
-
-USES+=		cmake compiler:c++11-lang cpe localbase:ldflags  perl5 pkgconfig readline \
-		shebangfix
-USE_GITHUB=	yes
-USE_PERL5=	run
-
-USERS=		bareos
-GROUPS=		${USERS}
-
-PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
-
-USE_LDCONFIG=	yes
-SHEBANG_LANG=	perl
-SHEBANG_FILES=	${WRKSRC}/core/src/cats/make_catalog_backup.pl.in
-
-CFLAGS+=	-Wno-error
-CPPFLAGS+=	-I${LOCALBASE}/readline
-
-OPTIONS_DEFAULT=	OPENSSL
-OPTIONS_SINGLE=		CRYPTO
-OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
-OPTIONS_SUB=		yes
-CRYPTO_DESC=		Cryptographic library
-MTX_DESC=		Install mtx for control of autochanger devices
-NDMP_DESC=		Enable build of NDMP support
-SCSICRYPTO_DESC=	Build LTO AME crypto plugin
-
-.if ${PKGNAMESUFFIX} == "21-server"
-OPTIONS_GROUP=	BACKENDS
-OPTIONS_GROUP_BACKENDS=	CEPHFS GFAPI RADOS
-OPTIONS_DEFINE=		MTX PYTHON LMDB NDMP NLS SCSICRYPTO
-OPTIONS_DEFAULT+=	LMDB PGSQL SCSICRYPTO
-OPTIONS_SINGLE_DATABASE=	PGSQL
-OPTIONS_SINGLE+=		DATABASE
-BACKENDS_DESC=		Storage backends
-DATABASE_DESC=		Database support
-CEPHFS_DESC=	CEPHFS backend support
-GFAPI_DESC=	GFAPI backend support
-LMDB_DESC=	Enable faster accurate backup support
-RADOS_DESC=	RADOS backend support
-
-NDMP_CMAKE_ON=	-Dndmp=ON
-NDMP_CMAKE_OFF=	-Dndmp=OFF
-.endif
-
-GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
-
-OPENSSL_USES=		ssl
-OPENSSL_CMAKE_ON=	-Dopenssl=ON
-OPENSSL_CMAKE_OFF=	-Dopenssl=OFF
-
-SCSICRYPTO_CMAKE_ON=	-Dscsi-crypto=ON
-SCSICRYPTO_CMAKE_OFF=	-Dscsi-crypto=OFF
-
-.if ${PKGNAMESUFFIX} == "21-client" || ${PKGNAMESUFFIX} == "21-server"  #Till end of the file
-PYTHON_USES=		python
-PYTHON_CMAKE_ON=	-DENABLE_PYTHON=ON
-PYTHON_CMAKE_OFF=	-DENABLE_PYTHON=OFF
-PYTHON_PLUGIN=		yes
-
-.if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+=	libbareos.so:sysutils/bareos21-client
-USE_RC_SUBR?=	bareos-dir bareos-sd
-.endif
-
-.if defined(WITH_CLIENT_ONLY)
-SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
-.else
-SUB_FILES+=	pkg-message.server
-.endif
-
-CMAKE_ARGS+=	-Dtcp-wrappers=ON \
-		-Dsmartalloc=ON \
-		-Dsysconfdir=${PREFIX}/etc \
-		-Darchivedir=${BAREOS_DIR}/storage \
-		-Dworkingdir=${BAREOS_DIR} \
-		-Dconfdir=${PREFIX}/etc/bareos \
-		-Dlibdir=${PREFIX}/lib \
-		-Dlogdir=/var/log/bareos \
-		-Dincludedir=${PREFIX}/include/bareos \
-		-Dreadline=ON \
-		-Ddisable-conio=ON \
-		-Dbatch-insert=ON \
-		-Dhave_plugins=ON \
-		-Dplugindir=${PREFIX}/lib/bareos/plugins \
-		-Dscriptdir=${PREFIX}/lib/bareos/scripts \
-		-Dbackenddir=${PREFIX}/lib/bareos/backends \
-		-Ddump_email=root@localhost \
-		-Djob_email=root@localhost \
-		-Ddb_name=bareos \
-		-Dsbin-perm=755 \
-		-Ddb_user=bareos \
-		-Dbaseport=9101 \
-		-Dpiddir=/var/run/bareos
-
-.if defined(WITH_CLIENT_ONLY)
-CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
-
-CMAKE_ARGS+=	-Dfd-user=root \
-		-Dfd-group=wheel \
-		-Dlmdb=ON
-.else
-LMDB_CMAKE_ON=	-Dlmdb=ON
-LMDB_CMAKE_OFF=	-Dlmdb=OFF
-LMDB_CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
-
-CMAKE_ARGS+=	-Ddir-user=${BAREOS_USER} \
-		-Ddir-group=${BAREOS_GROUP} \
-		-Dsd-user=${BAREOS_USER} \
-		-Dsd-group=operator
-.endif
-
-# The user/group IDs below are registered, see
-# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
-#
-BAREOS_USER?=	bareos
-BAREOS_GROUP?=	${BAREOS_USER}
-BAREOS_UID?=	997
-BAREOS_GID?=	${BAREOS_UID}
-BAREOS_DIR?=	/var/db/bareos
-
-PLIST_SUB+=	BAREOS_DIR=${BAREOS_DIR}
-
-SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
-		BAREOS_GROUP=${BAREOS_GROUP} \
-		BAREOS_UID=${BAREOS_UID} \
-		BAREOS_GID=${BAREOS_GID} \
-		BAREOS_DIR=${BAREOS_DIR}
-
-NLS_USES=		gettext
-NLS_CMAKE_ON=		-Dnls=ON
-CEPHFS_CMAKE_ON=	-Dcephfs=ON
-CEPHFS_LIB_DEPENDS=	libcephfs.so:net/ceph14
-GFAPI_CMAKE_ON=		-Dgfapi=ON
-GFAPI_LIB_DEPENDS=	libglusterfs.so:net/glusterfs
-RADOS_CMAKE_ON=		-Drados=ON -Dcephfs=ON
-RADOS_LIB_DEPENDS=	librados.so:net/ceph14
-
-# Client only or full server version
-.if defined(WITH_CLIENT_ONLY)
-CONFFILES=	fd
-CMAKE_ARGS+=	-Dclient-only=ON
-
-PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
-PKGINSTALL=	${FILESDIR}/pkg-install.client
-.else
-# Server only Options
-CONFFILES=		sd dir
-CMAKE_ARGS+=	-Dbuild-dird=ON \
-		-Dbuild-stored=ON \
-		-Dbuild_client_only=OFF
-# Server default database
-
-MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
-MYSQL_VARS=	DBTYPE=mysql
-MYSQL_SUB_LIST=		REQ_MYSQL=mysql REQ_PGSQL=""
-PGSQL_CMAKE_ON=		-Dpostgresql=ON
-PGSQL_USES=	pgsql
-PGSQL_VARS=	DBTYPE=postgresql
-PGSQL_SUB_LIST=		REQ_MYSQL="" REQ_PGSQL=postgresql
-SQLITE3_VARS=	DBTYPE=sqlite3
-
-PLIST_SUB+=		DBTYPE=${DBTYPE}
-
-.endif
-
-.if defined(WITH_CLIENT_ONLY)
-MP1+=	bconsole.1
-MP8+=	bareos-fd.8
-.else
-MP8+=	bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
-	btape.8 btraceback.8 bareos-dbcheck.8
-MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
-.endif
-
-MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
-
-post-patch:
-	@${REINPLACE_CMD}  '129,132d' ${WRKSRC}/CMakeLists.txt
-.if ${PKGNAMESUFFIX} == "21-server"
-	@${REINPLACE_CMD}  '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
-.endif
-.if ${PKGNAMESUFFIX} == "21-client"
-	@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
-.endif
-
-post-extract:
-.if defined(WITH_CLIENT_ONLY)
-.	if defined(PYTHON_PLUGIN)
-		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset
-		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job
-.	endif
-.endif
-	@${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
-		${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
-
-.if !target(post-install)
-post-install:
-.if defined(WITH_CLIENT_ONLY)
-	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
-	${CP} ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
-.else
-	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
-	${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
-	${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
-.endif
-	@${MKDIR} ${STAGEDIR}/var/run/bareos
-.endif
-.else
-.include "${MASTERDIR}/Makefile.common"
-.endif # -client and -server are defined
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD
-USES+=	llvm:max=15
-.endif
-
-.include <bsd.port.mk>
diff --git a/sysutils/bareos21-server/Makefile.common b/sysutils/bareos21-server/Makefile.common
deleted file mode 100644
index 7c27e0a23f24..000000000000
--- a/sysutils/bareos21-server/Makefile.common
+++ /dev/null
@@ -1,38 +0,0 @@
-post-patch:
-	@${REINPLACE_CMD}  '76,79d' ${WRKSRC}/CMakeLists.txt
-.if ${PKGNAMESUFFIX} == "-traymonitor"
-	@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
-.endif
-
-post-build:
-.if ${PKGNAMEPREFIX} == "nagios-check_"
-	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
-.endif
-
-pre-install:
-.if ${PKGNAMESUFFIX} == "21-traymonitor"
-.	for d in client director monitor storage
-		${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
-		${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
-.	endfor
-.endif
-
-do-install:
-.if ${PKGNAMEPREFIX} == "nagios-check_"
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
-	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
-	${STAGEDIR}${PREFIX}/libexec/nagios
-.endif
-.if ${PKGNAMESUFFIX} == "-client-static"
-	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static
-	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
-.endif
-.if ${PKGNAMESUFFIX} == "21-traymonitor"
-# Install config files and preserve existing ones
-.for d in client director monitor storage
-	${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
-.endfor
-	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/core/src/images/bareos_1.png ${STAGEDIR}${PREFIX}/share/pixmaps/bareos-tray-monitor.png
-	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
-.endif
diff --git a/sysutils/bareos21-server/distinfo b/sysutils/bareos21-server/distinfo
deleted file mode 100644
index 0b8d45b36960..000000000000
--- a/sysutils/bareos21-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1714628145
-SHA256 (bareos-bareos-Release-21.1.9_GH0.tar.gz) = cea611402f3d42903e8ad56808e43f3bc2163e0dbbbca4cba3f4abab8842320c
-SIZE (bareos-bareos-Release-21.1.9_GH0.tar.gz) = 11670286
diff --git a/sysutils/bareos21-server/files/bareos-barcodes b/sysutils/bareos21-server/files/bareos-barcodes
deleted file mode 100644
index f42cb7f7aeea..000000000000
--- a/sysutils/bareos21-server/files/bareos-barcodes
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Bacula barcode simulation file
-# used by ${PREFIX}/sbin/chio-bareos (FreeBSD)
-#
-# The volumenames are returned by the "changer list" command
-# labeling in the console is done by "label barcodes"
-# (then all volumes belog to the default pool).
-# All Lines with an "#" at the bedinning are ignored
-#
-# !!!! If you export an tape and reinsert another one,
-# !!!! don't forget to change the volume name in this file!
-#
-1:Volume1-100
-2:Volume1-101
-3:Volume1-102
-4:Volume1-103
-5:Volume1-104
-6:Volume1-105
-7:Volume1-106
-8:Volume1-107
-9:Volume1-108
-10:Volume1-109
-11:Volume1-110
-12:Volume1-111
-#
-# Further volumes exported from the changer
-#
-# 36GB AIT2 tapes
-#Volume1-100
-#Volume1-101
-#Volume1-102
-#Volume1-103
-#Volume1-104
-#Volume1-105
-#Volume1-106
-#Volume1-107
-#Volume1-108
-#Volume1-109
-#Volume1-110
-#Volume1-111
-#Volume1-112
-#Volume1-113
-#Volume1-114
-#Volume1-115
-#
-# 50GB AIT2 tapes
-#Volume2-200
-#Volume2-201
-#Volume2-202
-#Volume2-203
-#Volume2-204
diff --git a/sysutils/bareos21-server/files/bareos-dir.in b/sysutils/bareos21-server/files/bareos-dir.in
deleted file mode 100644
index 22272cf86231..000000000000
--- a/sysutils/bareos21-server/files/bareos-dir.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: bareos_dir
-# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# bareos_dir_enable  (bool):   Set to NO by default.
-#                Set it to YES to enable bareos_dir.
-# bareos_dir_flags (params):   Set params used to start bareos_dir.
-# bareos_dir_config (params):  Path to the config file/directory
-#
-
-. /etc/rc.subr
-
-name="bareos_dir"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${bareos_dir_enable="NO"}
-: ${bareos_dir_flags="-u bareos -g bareos -v"}
-: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"}
-: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
-
-command=%%PREFIX%%/sbin/bareos-dir
-command_args="-c ${bareos_dir_config} -p ${bareos_dir_pidfile}"
-pidfile="${bareos_dir_pidfile}"
-bconsole_command=/usr/local/bin/bconsole
-start_precmd="bareos_start_precmd"
-restart_precmd="bareos_dir_configtest"
-reload_precmd="bareos_dir_configtest"
-reload_cmd="bareos_dir_reload"
-configtest_cmd="bareos_dir_configtest"
-
-bareos_start_precmd() {
-	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
-	bareos_dir_configtest
-}
-
-bareos_dir_configtest() {
-	echo "Performing sanity check on ${bareos_dir_config} configuration:"
-	eval ${command} -t
-}
-
-bareos_dir_reload() {
-	echo "Performing a graceful reload"
-	# bconsole always exits with 0, so we can't check the return status for success.
-	echo "reload" | ${bconsole_command}
-}
-
-extra_commands="reload configtest"
-run_rc_command "$1"
diff --git a/sysutils/bareos21-server/files/bareos-fd.in b/sysutils/bareos21-server/files/bareos-fd.in
deleted file mode 100644
index 8d57c3c858bc..000000000000
--- a/sysutils/bareos21-server/files/bareos-fd.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: bareos_fd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# bareos_fd_enable  (bool):  Set to NO by default.
-#               Set it to YES to enable bareos_fd.
-# bareos_fd_flags (params):  Set params used to start bareos_fd.
-# bareos_fd_config (params):  Path to the config file/directory
-#
-
-. /etc/rc.subr
-
-name="bareos_fd"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${bareos_fd_enable="NO"}
-: ${bareos_fd_flags="-u root -g wheel -v"}
-: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"}
-: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
-
-command=%%PREFIX%%/sbin/bareos-fd
-command_args="-c ${bareos_fd_config} -p ${bareos_fd_pidfile}"
-pidfile="${bareos_fd_pidfile}"
-start_precmd="bareos_start_precmd"
-
-bareos_start_precmd() {
-	[ -d "${pidfile%/*}" ] || {
-		getent passwd bareos > /dev/null 2&>1
-		if [ $? -eq 0] ; then
-			# user bareos exists
-			install -d -o bareos -g bareos ${pidfile%/*}
-		else
-			# bareos_fd as solitair service
-			install -d -o root -g wheel ${pidfile%/*}
-		fi
-	}
-}
-
-run_rc_command "$1"
diff --git a/sysutils/bareos21-server/files/bareos-sd.in b/sysutils/bareos21-server/files/bareos-sd.in
deleted file mode 100644
index 529cf55140c0..000000000000
--- a/sysutils/bareos21-server/files/bareos-sd.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: bareos_sd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# bareos_sd_enable  (bool):  Set to NO by default.
-#               Set it to YES to enable bareos_sd.
-# bareos_sd_flags (params):  Set params used to start bareos_sd.
-# bareos_sd_config (params): Path to the config file/directory
-#
-
-. /etc/rc.subr
-
-name="bareos_sd"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${bareos_sd_enable="NO"}
-: ${bareos_sd_flags="-u bareos -g bareos -v"}
-: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"}
-: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
-
-command=%%PREFIX%%/sbin/bareos-sd
-command_args="-c ${bareos_sd_config} -p ${bareos_sd_pidfile}"
-pidfile="${bareos_sd_pidfile}"
-start_precmd="bareos_start_precmd"
-
-bareos_start_precmd() {
-	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
-}
-
-run_rc_command "$1"
diff --git a/sysutils/bareos21-server/files/chio-bareos b/sysutils/bareos21-server/files/chio-bareos
deleted file mode 100644
index f006ef78e6ce..000000000000
--- a/sysutils/bareos21-server/files/chio-bareos
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/bin/sh
-#
-# BAREOS interface to tape libraries and autoloaders for FreeBSD
-# (by Rudolf Cejka <cej...@fit.vutbr.cz>, v1.2, 2012/11/14)
-#
-# If you set in your Device resource
-#   Changer Command = "path-to-this-script/chio-changer %c %o %S %a %d"
-# you will have the following input to this script:
-#   chio-changer "changer-device" "command" "slot" "tape-device" "drive-index"
-#                       $1           $2       $3         $4            $5
-# for example (on a FreeBSD system):
-#   chio-changer /dev/ch0 load 1 /dev/nsa0 0
-#
-# If you change the script, take care to return either the chio exit
-# code or a 0. If the script exits with a non-zero exit code, BAREOS
-# will assume the request failed.
-#
-
-PROGNAME=`basename $0`
-
-# Uncomment the following line, if you want to log debug output.
-#DEBUG=/var/run/bareos/${PROGNAME}.log
-
-# Uncomment the following line, if you need to eject a tape before moving
-# it from the drive.
-#OFFLINE=yes
-
-# Uncomment one or more of the following lines, if you need to wait for
-# some time (in seconds) after unloading, loading or transferring a tape.
-#OFFLINE_SLEEP=10
-#LOAD_SLEEP=10
-#MOVE_SLEEP=10
-
-# Uncomment the following line, if you do not have a changer with volume
-# reader.
-#FAKE_BARCODES=/usr/local/etc/bareos-barcodes
-
-usage()
-{
-  cat <<EOF
-Usage: ${PROGNAME} <changer-device> <cmd> [slot] [tape-device] [drive-index]
-
-Commands (<cmd>):
-  unload          Unload a tape into the slot from where it was loaded
-  load <slot>     Load a tape from the slot <slot> (1-based)
-  transfer <slot> <slotdst> Transfer a tape from the slot <slot> to
-                  the slot <slotdst> (1-based)
-  list            List full storage slots
-  listall         List all storage slots and drives with source information
-  loaded          Give slot from where the tape was loaded (0 = empty drive)
-  slots           Give number of available slots
-
-Example:
-  ${PROGNAME} /dev/ch0 load 1        Load a tape from the slot 1
-
-EOF
-  exit 1
-}
-
-# Default settings
-CHANGER=/dev/ch0
-TAPE=/dev/nsa0
-DRIVE=0
-
-CHIO=/bin/chio
-MT=/usr/bin/mt
-
-if [ -n "${DEBUG}" ]; then
-  MSG=$0
-  for PAR; do MSG="${MSG} \"${PAR}\""; done
-  echo `date +"%Y/%m/%d %H:%M:%S"` ${MSG} >> ${DEBUG}
-fi
-
-if [ -n "$1" ]; then
-  CHANGER=$1;
-fi
-COMMAND=$2
-SLOT=$3
-SLOTDST=$4
-if [ -n "$4" ]; then
-  TAPE=$4
-fi
-if [ -n "$5" ]; then
-  DRIVE=$5
-fi
-
-case ${COMMAND} in
-unload)
-  if [ "${OFFLINE}" = yes ]; then
-    ${MT} -f ${TAPE} offline
-    if [ $? = 0 -a -n "${OFFLINE_SLEEP}" ]; then
-      sleep ${OFFLINE_SLEEP}
-    fi
-  fi
-  if [ -z "${SLOT}" ]; then
-    ${CHIO} -f ${CHANGER} return drive ${DRIVE}
-  else
-    ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${SLOT} - 1))
-  fi
-  if [ $? -ne 0 ]; then
-    # In case of an error, try to unload the cartridge to the first free slot
-    FREE=`${CHIO} -f ${CHANGER} status slot | \
-      sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \
-      awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'`
-    if [ ${FREE} -gt 0 ]; then
-      ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${FREE} - 1))
-    else
-      exit 1
-    fi
-  fi
-  ;;
-load)
-  if [ -z "${SLOT}" ]; then
-    usage
-  fi
-  ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) drive ${DRIVE}
-  if [ $? -ne 0 ]; then
-    exit 1
-  fi
-  if [ -n "${LOAD_SLEEP}" ]; then
-    sleep ${LOAD_SLEEP}
-  fi
-  ;;
-transfer)
-  if [ -z "${SLOT}" -o -z "${SLOTDST}" ]; then
-    usage
-  fi
-  ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) slot $((${SLOTDST} - 1))
-  if [ $? -ne 0 ]; then
-    exit 1
-  fi
-  if [ -n "${MOVE_SLEEP}" ]; then
-    sleep ${MOVE_SLEEP}
-  fi
-  ;;
-list)
-  if [ -z "${FAKE_BARCODES}" ]; then
-    ${CHIO} -f ${CHANGER} status -v slot | \
-      sed -ne 's/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/\1:\2/p' | \
-      awk -F: '{ print $1 + 1 ":" $2 }'
-  else
-    if [ -f "${FAKE_BARCODES}" ]; then
-      grep -v -e "^#" -e "^$" < ${FAKE_BARCODES}
-    else
-      echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing"
-      exit 1
-    fi
-  fi
-  ;;
-listall)
-  if [ -z "${FAKE_BARCODES}" ]; then
-    ${CHIO} -f ${CHANGER} status -vS | \
-      sed -ne '
-      s/^slot *\([0-9]*\):.*ENAB.*FULL.*voltag.*<\([^:]*\):.*/I:\1:F:\2/p;t
-      s/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/S:\1:F:\2/p;t
-      s/^drive *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*source.*<[^0-9]*\([0-9]*\)>.*/D:\1:F:\3:\2/p;t
-      s/^slot *\([0-9]*\):.*ENAB.*voltag.*<\([^:]*\):.*/I:\1:E/p;t
-      s/^slot *\([0-9]*\):.*voltag.*<\([^:]*\):.*/S:\1:E/p;t
-      s/^drive *\([0-9]*\):.*voltag.*<\([^:]*\):.*/D:\1:E/p' | \
-      awk -F: '{ for (n = 1; n <= NF; n++) printf "%s%s",
-      (n == ($1 == "D" ? 4 : 2)) ? ($n == "" ? 0 : $n + 1) : $n,
-      (n == NF) ? "\n" : ":" }'
-  else
-    if [ -f "${FAKE_BARCODES}" ]; then
-      grep -v -e "^#" -e "^$" < ${FAKE_BARCODES} | \
-        awk -F: '{ print "S:" $1 (match($2, "^ *$") ? ":E" : ":F:" $2) }'
-    else
-      echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing"
-      exit 1
-    fi
-  fi
-  ;;
-loaded)
-  # If a tape is loaded, but the source slot is unknown (for example,
-  # after library reboot), try to report the first free slot
-  FREE=`${CHIO} -f ${CHANGER} status slot | \
-    sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \
-    awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'`
-  ${CHIO} -f ${CHANGER} status -S drive | \
-    sed -ne 's/^drive *'${DRIVE}':.*FULL.*source.*<[^0-9]*\([0-9]*\)>.*/\1/p' \
-    | awk 'BEGIN { n = 0 } { n = ($1 == "") ? '${FREE}' : $1 + 1 } \
-    END { print n }'
-  ;;
-slots)
-  ${CHIO} -f ${CHANGER} status | grep -c "^slot "
-  ;;
-*)
-  usage
-  ;;
-esac
diff --git a/sysutils/bareos21-server/files/patch-core-CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-CMakeLists.txt
deleted file mode 100644
index b7e291bf0d60..000000000000
--- a/sysutils/bareos21-server/files/patch-core-CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
---- core/CMakeLists.txt	2022-11-09 08:14:10.000000000 -0500
-+++ core/CMakeLists.txt	2022-11-18 00:11:43.670601000 -0500
-@@ -283,7 +283,9 @@
-   set(HAVE_FREEBSD_OS 1)
-   include_directories(/usr/local/include)
-   link_directories(/usr/local/lib)
--  link_libraries(intl)
-+  if(nls)
-+    link_libraries(intl)
-+  endif()
-   check_cxx_compiler_flag(
-     -Wunused-but-set-variable compiler_will_warn_of_unused_but_set_variable
-   )
-@@ -350,7 +352,9 @@
-   add_definitions("-D_FILE_OFFSET_BITS=64")
- endif()
- 
--include(FindIntl)
-+if(nls)
-+  include(FindIntl)
-+endif()
- 
- if(developer)
-   add_definitions("-DDEVELOPER=1")
-@@ -368,7 +372,7 @@
- include(BareosFindStaticCodeAnalysisTools)
- 
- if(NOT client-only
--   AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS"
-+   AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS|FreeBSD"
-    AND CMAKE_SIZEOF_VOID_P EQUAL 8
- )
-   # droplet does not build on solaris because of sys/cdefs.h: No such file or
-@@ -782,7 +786,6 @@
- 
- add_subdirectory(scripts)
- add_subdirectory(manpages)
--add_subdirectory(platforms)
- add_subdirectory(src)
- 
- include(BareosLocalBuildDefinitions OPTIONAL
diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosCheckIncludes.cmake
deleted file mode 100644
index e439a0254191..000000000000
--- a/sysutils/bareos21-server/files/patch-core-cmake_BareosCheckIncludes.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
---- core/cmake/BareosCheckIncludes.cmake	2020-12-16 02:46:16.000000000 -0500
-+++ core/cmake/BareosCheckIncludes.cmake	2020-12-23 22:25:00.323963000 -0500
-@@ -60,19 +60,25 @@
- check_include_files(sys/proplist.h HAVE_SYS_PROPLIST_H)
- check_include_files(sys/xattr.h HAVE_SYS_XATTR_H)
- 
--include(CheckSymbolExists)
--include(CMakePushCheckState)
--cmake_push_check_state()
--set(CMAKE_REQUIRED_LIBRARIES cephfs)
--check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX)
--cmake_pop_check_state()
-+if(cephfs)
-+  include(CheckSymbolExists)
-+  include(CMakePushCheckState)
-+  cmake_push_check_state()
-+  set(CMAKE_REQUIRED_LIBRARIES cephfs)
-+  check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX)
-+  cmake_pop_check_state()
-+endif()
- 
--check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H)
--check_include_files(
--  radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H
--)
-+if(rados)
-+  check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H)
-+  check_include_files(
-+    radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H
-+  )
-+endif()
- 
--check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
-+if(gfapi)
-+  check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
-+endif()
- 
- check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H)
- 
diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
deleted file mode 100644
index e3ff7074a02f..000000000000
--- a/sysutils/bareos21-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- core/cmake/BareosFindAllLibraries.cmake	2022-08-05 04:40:11.000000000 -0500
-+++ core/cmake/BareosFindAllLibraries.cmake	2022-10-31 16:28:14.422391000 -0500
-@@ -175,12 +175,18 @@
-   )
- endif()
- 
--bareosfindlibraryandheaders("rados" "rados/librados.h" "")
--bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "")
--bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "")
-+if(rados)
-+  bareosfindlibraryandheaders("rados" "rados/librados.h" "")
-+  bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "")
-+endif()
-+if(cephfs)
-+  bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "")
-+endif()
- bareosfindlibraryandheaders("pthread" "pthread.h" "")
- bareosfindlibraryandheaders("cap" "sys/capability.h" "")
--bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "")
-+if(gfapi)
-+  bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "")
-+endif()
- 
- bareosfindlibraryandheaders("pam" "security/pam_appl.h" "")
- 
diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
deleted file mode 100644
index 63a2ea93f5a4..000000000000
--- a/sysutils/bareos21-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
+++ /dev/null
@@ -1,119 +0,0 @@
---- core/cmake/BareosInstallConfigFiles.cmake	2024-02-28 05:24:21.000000000 -0500
-+++ core/cmake/BareosInstallConfigFiles.cmake	2024-05-02 00:46:57.386839000 -0500
-@@ -27,27 +27,13 @@
-   endif()
- 
-   get_filename_component(fname ${configfile} NAME)
--  if(EXISTS ${DESTCONFDIR}${additionalconfigdir}/${fname})
--    message(
--      STATUS "${DESTCONFDIR}${additionalconfigdir}/${fname} already exists"
--    )
--    message(
--      STATUS
--        "Installing config: ${DESTCONFDIR}${additionalconfigdir}/${fname}.new"
--    )
--    file(RENAME "${configfile}" "${configfile}.new")
--    file(COPY "${configfile}.new"
--         DESTINATION "${DESTCONFDIR}${additionalconfigdir}"
--    )
--    file(RENAME "${configfile}.new" "${configfile}")
--  else()
--    message(
--      STATUS "Installing config: ${DESTCONFDIR}${additionalconfigdir}/${fname}"
--    )
--    file(COPY "${configfile}"
--         DESTINATION "${DESTCONFDIR}${additionalconfigdir}"
--    )
--  endif()
-+
-+  message(STATUS "${DESTCONFDIR}${additionalconfigdir}/${fname} as ${DESTCONFDIR}${additionalconfigdir}/${fname}.sample (new installation)")
-+  file(RENAME "${configfile}" "${configfile}.sample")
-+  file(
-+       COPY "${configfile}.sample"
-+       DESTINATION "${DESTCONFDIR}${additionalconfigdir}"
-+  )
- endfunction()
- 
- macro(BareosInstallConfigFiles CONFDIR CONFIGBASEDIRECTORY PLUGINS BACKENDS
-@@ -125,23 +111,12 @@
-       get_filename_component(dir ${configfile} DIRECTORY)
-       get_filename_component(fname ${configfile} NAME)
- 
--      if(EXISTS ${DESTCONFDIR}/${configfile})
--        message(STATUS "${configfile} as ${configfile}.new (keep existing)")
--        file(RENAME "${BackendConfigSrcDir}/${configfile}"
--             "${BackendConfigSrcDir}/${configfile}.new"
--        )
--        file(COPY "${BackendConfigSrcDir}/${configfile}.new"
--             DESTINATION "${DESTCONFDIR}/${dir}"
--        )
--        file(RENAME "${BackendConfigSrcDir}/${configfile}.new"
--             "${BackendConfigSrcDir}/${configfile}"
--        )
--      else()
--        message(STATUS "${configfile} as ${configfile}")
--        file(COPY "${BackendConfigSrcDir}/${configfile}"
--             DESTINATION "${DESTCONFDIR}/${dir}"
--        )
--      endif()
-+      message(STATUS "${configfile} as ${configfile}.sample")
-+      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
-+      file(
-+       COPY "${BackendConfigSrcDir}/${configfile}.sample"
-+       DESTINATION "${DESTCONFDIR}/${dir}"
-+      )
-     endforeach()
- 
-     file(
-@@ -151,7 +126,8 @@
-     )
-     foreach(configfile ${configfiles})
-       get_filename_component(dir ${configfile} DIRECTORY)
--      # get_filename_component(fname ${configfile} NAME)
-+      get_filename_component(fname ${configfile} NAME)
-+      get_filename_component(fsname ${configfile} NAME_WE)
- 
-       if(EXISTS ${DESTCONFDIR}/${configfile})
-         message(STATUS "overwriting ${configfile}")
-@@ -159,9 +135,10 @@
-         message(STATUS "${configfile} as ${configfile}")
-       endif()
- 
--      file(COPY "${BackendConfigSrcDir}/${configfile}"
--           DESTINATION "${DESTCONFDIR}/${dir}"
--      )
-+      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample")
-+      file(
-+       COPY "${BackendConfigSrcDir}/${fsname}.conf.sample"
-+       DESTINATION "${DESTCONFDIR}/${dir}")
-     endforeach()
- 
-   endforeach()
-@@ -188,20 +165,13 @@
-         string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile})
-         if(NOT "${IS_INFILE}" STREQUAL ".in")
-           get_filename_component(fname ${configfile} NAME)
--          if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
--            message(
--              STATUS
--                "${resname}/${fname} as ${resname}/${fname}.new (keep existing)"
--            )
--            file(RENAME "${configfile}" "${configfile}.new")
--            file(COPY "${configfile}.new"
--                 DESTINATION "${DESTCONFDIR}/${resname}"
--            )
--            file(RENAME "${configfile}.new" "${configfile}")
--          else()
--            message(STATUS "${resname}/${fname} as ${resname}/${fname}")
--            file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
--          endif()
-+          get_filename_component(fsname ${configfile} NAME_WE)
-+          message(STATUS "${resname}/${fname} as ${resname}/${fname}")
-+          file(RENAME "${configfile}" "${resdir}/${fsname}.conf.sample")
-+          file(
-+            COPY "${resdir}/${fsname}.conf.sample"
-+            DESTINATION "${DESTCONFDIR}/${resname}"
-+          )
-         else()
-           message(STATUS "skipping .in file ${configfile}:${IS_INFILE}")
-         endif()
diff --git a/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
deleted file mode 100644
index 13a68449b4d3..000000000000
--- a/sysutils/bareos21-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- core/cmake/BareosSetVariableDefaults.cmake	2024-02-28 05:24:21.000000000 -0500
-+++ core/cmake/BareosSetVariableDefaults.cmake	2024-05-02 00:57:55.264449000 -0500
-@@ -568,8 +568,10 @@
- set(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${BAREOS_NUMERIC_VERSION}\"")
- set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
- 
--if(NOT DEFINED ENABLE_NLS)
--  set(ENABLE_NLS 1)
-+if(nls)
-+  SET(ENABLE_NLS 1)
-+else()
-+  SET(ENABLE_NLS 0)
- endif()
- 
- if(HAVE_WIN32)
diff --git a/sysutils/bareos21-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-manpages_CMakeLists.txt
deleted file mode 100644
index 5774b72f2740..000000000000
--- a/sysutils/bareos21-server/files/patch-core-manpages_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- core/manpages/CMakeLists.txt	2021-12-21 06:00:49.000000000 -0500
-+++ core/manpages/CMakeLists.txt	2021-12-22 00:19:52.189513000 -0500
-@@ -18,9 +18,11 @@
- #   02110-1301, USA.
- message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
- 
--set(MAN1 bconsole.1 bsmtp.1)
-+if(client-only)
-+  set(MAN1 bconsole.1 bsmtp.1)
- 
--set(MAN8 bareos-fd.8 bareos.8 btraceback.8)
-+  set(MAN8 bareos-fd.8 bareos.8 btraceback.8)
-+endif()
- 
- if(NOT client-only)
-   set(MAN1-server bareos-tray-monitor.1 bwild.1 bregex.1)
diff --git a/sysutils/bareos21-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-scripts_CMakeLists.txt
deleted file mode 100644
index 9d10e0a79552..000000000000
--- a/sysutils/bareos21-server/files/patch-core-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
---- core/scripts/CMakeLists.txt	2021-12-21 06:00:49.000000000 -0500
-+++ core/scripts/CMakeLists.txt	2021-12-22 00:23:34.270541000 -0500
-@@ -18,34 +18,36 @@
- #   02110-1301, USA.
- message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
- 
--install(
--  FILES bareos btraceback
--  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
--              WORLD_READ WORLD_EXECUTE
--  DESTINATION "${sbindir}"
--)
-+if(client-only)
-+  install(
-+    FILES bareos btraceback
-+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-+                WORLD_READ WORLD_EXECUTE
-+    DESTINATION "${sbindir}"
-+  )
- 
--install(
--  FILES bareos-ctl-fd
--  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
--              WORLD_READ WORLD_EXECUTE
--  DESTINATION "${scriptdir}"
--  COMPONENT filedaemon
--)
-+  install(
-+    FILES bareos-ctl-fd
-+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-+                WORLD_READ WORLD_EXECUTE
-+    DESTINATION "${scriptdir}"
-+    COMPONENT filedaemon
-+  )
- 
--install(
--  FILES bareos bareos-config
--  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
--              WORLD_READ WORLD_EXECUTE
--  DESTINATION "${scriptdir}"
--)
-+  install(
-+    FILES bareos bareos-config
-+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-+                WORLD_READ WORLD_EXECUTE
-+    DESTINATION "${scriptdir}"
-+  )
- 
--install(
--  FILES bareos-config-lib.sh bareos-ctl-funcs btraceback.gdb btraceback.dbx
--        btraceback.mdb
--  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
--  DESTINATION "${scriptdir}"
--)
-+  install(
-+    FILES bareos-config-lib.sh bareos-ctl-funcs btraceback.gdb btraceback.dbx
-+          btraceback.mdb
-+    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-+    DESTINATION "${scriptdir}"
-+  )
-+endif()
- 
- if(NOT client-only)
-   install(
diff --git a/sysutils/bareos21-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-src-dird_CMakeLists.txt
deleted file mode 100644
index 688519f35afe..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src-dird_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- core/src/dird/CMakeLists.txt	2022-01-16 10:44:41.285876000 -0500
-+++ core/src/dird/CMakeLists.txt	2022-01-16 10:46:30.370557000 -0500
-@@ -158,7 +158,7 @@
- add_executable(bareos-dir)
- target_sources(bareos-dir PRIVATE dird.cc)
- 
--target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind)
-+target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind ${JANSSON_LIBRARIES})
- 
- if(HAVE_WIN32)
-   target_sources(
-@@ -184,7 +184,7 @@
- add_executable(bareos-dbcheck ${DBCHKSRCS})
- 
- target_link_libraries(
--  bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES}
-+  bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES} ${JANSSON_LIBRARIES}
- )
- 
- # is not built by default
diff --git a/sysutils/bareos21-server/files/patch-core-src-dird_catreq.cc b/sysutils/bareos21-server/files/patch-core-src-dird_catreq.cc
deleted file mode 100644
index e16e259a9ffa..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src-dird_catreq.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- core/src/dird/catreq.cc	2022-01-21 09:00:16.883799000 -0500
-+++ core/src/dird/catreq.cc	2022-01-21 09:02:08.619060000 -0500
-@@ -656,7 +656,7 @@
-   bool retval = false;
-   int32_t pktsiz;
-   size_t nbytes;
--  ssize_t size = 0;
-+//  ssize_t size = 0;
-   int32_t message_length; /* message length */
-   int spool_fd = -1;
-   POOLMEM* msg = GetPoolMemory(PM_MESSAGE);
-@@ -680,7 +680,7 @@
- 
-   while ((nbytes = read(spool_fd, (char*)&pktsiz, sizeof(int32_t)))
-          == sizeof(int32_t)) {
--    size += sizeof(int32_t);
-+    //size += sizeof(int32_t);
-     message_length = ntohl(pktsiz);
- 
-     if (message_length > 0) {
-@@ -697,7 +697,7 @@
-         goto bail_out;
-       }
-       msg[nbytes] = '\0';
--      size += nbytes;
-+      //size += nbytes;
-     }
- 
-     if (!jcr->IsJobCanceled()) {
diff --git a/sysutils/bareos21-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos21-server/files/patch-core-src-include_baconfig.h
deleted file mode 100644
index 21afd978730d..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src-include_baconfig.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- core/src/include/baconfig.h	2020-12-16 02:46:16.000000000 -0500
-+++ core/src/include/baconfig.h	2020-12-23 22:47:40.992698000 -0500
-@@ -103,11 +103,11 @@
- #    define N_(s) (s)
- #  endif /* N_ */
- #else    /* !ENABLE_NLS */
-+#  include <locale.h>
- #  undef _
- #  undef N_
- #  undef textdomain
- #  undef bindtextdomain
--#  undef setlocale
- 
- #  ifndef _
- #    define _(s) (s)
-@@ -120,9 +120,6 @@
- #  endif
- #  ifndef bindtextdomain
- #    define bindtextdomain(p, d)
--#  endif
--#  ifndef setlocale
--#    define setlocale(p, d)
- #  endif
- #endif /* ENABLE_NLS */
- 
diff --git a/sysutils/bareos21-server/files/patch-core-src-plugins-filed_CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-src-plugins-filed_CMakeLists.txt
deleted file mode 100644
index ccb41fb15e8c..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src-plugins-filed_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- core/src/plugins/filed/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
-+++ core/src/plugins/filed/CMakeLists.txt	2020-12-23 22:56:13.843714000 -0500
-@@ -41,7 +41,9 @@
- 
- include_directories(${OPENSSL_INCLUDE_DIR})
- 
--add_subdirectory(python)
-+if(python)
-+  add_subdirectory(python)
-+endif()
- 
- add_library(bpipe-fd MODULE bpipe/bpipe-fd.cc)
- set_target_properties(bpipe-fd PROPERTIES PREFIX "")
diff --git a/sysutils/bareos21-server/files/patch-core-src-plugins-stored_CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-src-plugins-stored_CMakeLists.txt
deleted file mode 100644
index a693d11d6b6a..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src-plugins-stored_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- core/src/plugins/stored/CMakeLists.txt	2021-12-21 06:00:49.000000000 -0500
-+++ core/src/plugins/stored/CMakeLists.txt	2022-01-15 09:28:41.225020000 -0500
-@@ -33,6 +33,12 @@
-   endif()
- endif()
- 
-+if(HAVE_FREEBSD_OS)
-+  include_directories(
-+    ${PROJECT_SOURCE_DIR}/src/fastlz/include
-+  )
-+endif()
-+
- add_subdirectory(python)
- 
- add_library(autoxflate-sd MODULE autoxflate/autoxflate-sd.cc)
diff --git a/sysutils/bareos21-server/files/patch-core-src-stored_CMakelists.txt b/sysutils/bareos21-server/files/patch-core-src-stored_CMakelists.txt
deleted file mode 100644
index 64ee102c21f5..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src-stored_CMakelists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- core/src/stored/CMakeLists.txt	2021-12-21 06:00:49.000000000 -0500
-+++ core/src/stored/CMakeLists.txt	2022-03-04 20:56:52.809609000 -0500
-@@ -219,7 +219,7 @@
- add_executable(bareos-sd stored.cc)
- 
- target_link_libraries(
--  bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads
-+  bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads ${JANSSON_LIBRARIES}
- )
- 
- if(HAVE_WIN32)
-@@ -228,7 +228,7 @@
- endif()
- if(HAVE_NDMP)
-   target_link_libraries(stored_objects PRIVATE bareosndmp)
--  target_link_libraries(bareos-sd PRIVATE bareosndmp)
-+  target_link_libraries(bareos-sd PRIVATE bareosndmp ${JANSSON_LIBRARIES})
- endif()
- 
- add_executable(bls ${BLSSRCS})
diff --git a/sysutils/bareos21-server/files/patch-core-src-tests_CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-src-tests_CMakeLists.txt
deleted file mode 100644
index c61a3775fcb3..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src-tests_CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
---- core/src/tests/CMakeLists.txt	2023-04-05 11:45:57.490983000 -0500
-+++ core/src/tests/CMakeLists.txt	2023-04-05 11:53:08.135702000 -0500
-@@ -131,7 +131,7 @@
- if(NOT client-only)
-   bareos_add_test(
-     run_on_incoming_connect_interval
--    LINK_LIBRARIES dird_objects bareos bareosfind bareossql
-+    LINK_LIBRARIES ${JANSSON_LIBRARIES} dird_objects bareos bareosfind bareossql
-                    $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> GTest::gtest_main
-   )
- endif() # NOT client-only
-@@ -139,14 +139,14 @@
- if(NOT client-only)
-   bareos_add_test(
-     scheduler
--    LINK_LIBRARIES dird_objects bareos bareosfind bareossql
-+    LINK_LIBRARIES ${JANSSON_LIBRARIES} dird_objects bareos bareosfind bareossql
-                    $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> GTest::gtest_main
-   )
- endif() # NOT client-only
- 
- if(NOT client-only)
-   bareos_add_test(
--    scheduler_job_item_queue LINK_LIBRARIES dird_objects bareos bareosfind
-+    scheduler_job_item_queue LINK_LIBRARIES ${JANSSON_LIBRARIES} dird_objects bareos bareosfind
-                                             bareossql GTest::gtest_main
-   )
- endif() # NOT client-only
-@@ -180,7 +180,7 @@
- 
- if(NOT client-only)
-   bareos_add_test(
--    test_sd_plugins LINK_LIBRARIES bareos bareossd GTest::gtest_main
-+    test_sd_plugins LINK_LIBRARIES ${JANSSON_LIBRARIES} bareos bareossd GTest::gtest_main
-   )
- endif() # NOT client-only
- 
-@@ -195,14 +195,14 @@
- )
- 
- if(NOT client-only)
--  bareos_add_test(multiplied_device_test LINK_LIBRARIES ${LINK_LIBRARIES})
-+  bareos_add_test(multiplied_device_test LINK_LIBRARIES ${LINK_LIBRARIES} ${JANSSON_LIBRARIES})
- endif()
- 
- if(NOT client-only)
-   bareos_add_test(
-     ndmp_address_translate_test
-     ADDITIONAL_SOURCES ../dird/ndmp_slot2elemaddr.cc
--    LINK_LIBRARIES ${LINK_LIBRARIES}
-+    LINK_LIBRARIES ${LINK_LIBRARIES} ${JANSSON_LIBRARIES}
-   )
- endif() # NOT client-only
- 
-@@ -230,7 +230,7 @@
- if(NOT client-only)
-   bareos_add_test(
-     show_cmd_available_resources_equals_config_resources
--    LINK_LIBRARIES dird_objects bareos bareosfind bareossql GTest::gtest_main
-+    LINK_LIBRARIES ${JANSSON_LIBRARIES} dird_objects bareos bareosfind bareossql GTest::gtest_main
-   )
- endif() # NOT client-only
- 
diff --git a/sysutils/bareos21-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos21-server/files/patch-core-src_CMakeLists.txt
deleted file mode 100644
index 7174a3f71796..000000000000
--- a/sysutils/bareos21-server/files/patch-core-src_CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
---- core/src/CMakeLists.txt	2023-03-24 04:54:59.000000000 -0500
-+++ core/src/CMakeLists.txt	2023-04-05 13:08:47.420859000 -0500
-@@ -18,7 +18,9 @@
- #   02110-1301, USA.
- message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
- 
--add_subdirectory(filed)
-+if(client-only)
-+  add_subdirectory(filed)
-+endif()
- 
- if(NOT client-only)
-   add_subdirectory(tools)
-@@ -40,24 +42,28 @@
- elseif(NOT GTest_FOUND)
-   message(STATUS "Skipping unit tests as gtest was not found")
- else()
--  add_subdirectory(tests)
-+# add_subdirectory(tests)
- endif()
- 
- if(BUILD_BENCHMARKS)
-   add_subdirectory(benchmarks)
- endif()
- 
--if(ENABLE_BCONSOLE)
--  add_subdirectory(console)
--endif()
-+if(client-only)
-+  if(ENABLE_BCONSOLE)
-+    add_subdirectory(console)
-+  endif()
- 
--if(${HAVE_LMDB})
--  add_subdirectory(lmdb)
-+  if(${HAVE_LMDB})
-+    add_subdirectory(lmdb)
-+  endif()
-+  add_subdirectory(lib)
-+  add_subdirectory(findlib)
-+  add_subdirectory(fastlz)
- endif()
--add_subdirectory(lib)
--add_subdirectory(findlib)
-+
- add_subdirectory(plugins)
--add_subdirectory(fastlz)
-+
- if(${traymonitor})
-   add_subdirectory(qt-tray-monitor)
- endif()
diff --git a/sysutils/bareos21-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos21-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
deleted file mode 100644
index bf079968d9d4..000000000000
--- a/sysutils/bareos21-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- core/cmake/bareos-symlink-default-db-backend.cmake.orig	2020-12-11 13:44:43 UTC
-+++ core/cmake/bareos-symlink-default-db-backend.cmake
-@@ -16,13 +16,31 @@
- #   along with this program; if not, write to the Free Software
- #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- #   02110-1301, USA.
-+
-+# The ${libdir} and ${backenddir} are absolute, so figure out
-+# a relative path (${backenddir} lives under ${libdir}) instead.
-+# Make the link relative, placing the libbareoscats.so in ${libdir}.
-+# Within this script, VERSION is set to BAREOS_NUMERIC_VERSION (see
-+# core/src/cats/CMakeLists.txt).
- message(
-   STATUS
-     "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- )
-+file(
-+  RELATIVE_PATH 
-+    _rel 
-+    ${libdir} 
-+    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
-+)
-+message(
-+  STATUS 
-+    ".. actually ${_rel} in $ENV{DESTDIR} v ${VERSION}"
-+)
-+
- execute_process(
-   COMMAND
-     ${CMAKE_COMMAND} -E create_symlink
--    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
--    ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
-+    ${_rel}
-+    libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION}
-+    WORKING_DIRECTORY $ENV{DESTDIR}${libdir} COMMAND_ECHO STDOUT
- )
diff --git a/sysutils/bareos21-server/files/pkg-deinstall.client.in b/sysutils/bareos21-server/files/pkg-deinstall.client.in
deleted file mode 100644
index a6b96a17667d..000000000000
--- a/sysutils/bareos21-server/files/pkg-deinstall.client.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-# Note how to delete UID/GID
-USER=%%BAREOS_USER%%
-GROUP=%%BAREOS_GROUP%%
-UID=%%BAREOS_UID%%
-GID=%%BAREOS_UID%%
-BAREOS_DIR=%%BAREOS_DIR%%
-
-TMPFILE=/tmp/services-$RANDOM-$$
-
-case "$2" in
-"DEINSTALL")
-	# Delete entries in /etc/services
-        sed -e '/# Bareos port start/,/# Bareos port end/{' \
-            -e 'd' \
-            -e '}' /etc/services > $TMPFILE
-        mv -f $TMPFILE /etc/services
-
-	if [ -d ${BAREOS_DIR} ]; then
-	    echo "Check if ${BAREOS_DIR} is empty and delete it to permanently remove the bareos port."
-	fi
-
-	if pw groupshow "${USER}" 2>/dev/null 1>&2; then
-	    echo "To delete Bareos group permanently, use 'pw groupdel ${GROUP}'"
-	fi
-        ;;
-esac
diff --git a/sysutils/bareos21-server/files/pkg-install.client.in b/sysutils/bareos21-server/files/pkg-install.client.in
deleted file mode 100644
index 70ca57028237..000000000000
--- a/sysutils/bareos21-server/files/pkg-install.client.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-# Always add lines in /etc/services
-grep -q "bareos-dir" /etc/services
-if [ "$?" != "0" ]; then
-    echo "# Bareos port start
-bareos-dir      9101/tcp   #Bareos director daemon
-bareos-fd       9102/tcp   #Bareos file daemon
-bareos-sd       9103/tcp   #Bareos storage daemon
-# Bareos port end" >> /etc/services
-fi
diff --git a/sysutils/bareos21-server/files/pkg-message.client.in b/sysutils/bareos21-server/files/pkg-message.client.in
deleted file mode 100644
index b3e2d5825e13..000000000000
--- a/sysutils/bareos21-server/files/pkg-message.client.in
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-bareos client was installed
-
-1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-fd.d/ and 
-   %%PREFIX%%/etc/bareos/bconsole.d/
-
-2) Add bareos_fd_enable="YES" to /etc/rc.conf.
-
-3) If you want to retain old configuration scheme, you must add the following
-   to /etc/rc.conf
-
-  bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"
-EOM
-}
-]
diff --git a/sysutils/bareos21-server/files/pkg-message.server.in b/sysutils/bareos21-server/files/pkg-message.server.in
deleted file mode 100644
index 3bb0ef535ce1..000000000000
--- a/sysutils/bareos21-server/files/pkg-message.server.in
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-bareos server was installed
-
-1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-dir.d/ and
-   %%PREFIX%%/etc/bareos/bareos-sd.d/ directories
-
-2) Add bareos_dir_enable="YES" and bareos_sd_enable="YES" to /etc/rc.conf.
-
-3) If you want to retain old configuration scheme, you must add the following
-   to /etc/rc.conf
-
-  bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf"
-  bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf"
-
-4) Important information about new version of bareos can be found in the
-   ReleaseNotes.
-
-   https://github.com/bareos/bareos/blob/master/README.md
-
-NOTE:
-
-An auto-changer manipulation script based on FreeBSDs
-chio command is included and installed at
-
-  %%PREFIX%%/sbin/chio-bareos
-
-Please have a look at it if you want to use an
-autochanger. You have to configure the usage in
-
-  %%PREFIX%%/etc/bareos/bareos-dir.conf or
-  %%PREFIX%%/etc/bareos/bareos-dir.d/storage/
-
-Take care of correct permissions for changer and
-tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
-they must be accessible by user bareos.
-
-Due to lack of some features in the FreeBSD tape driver
-implementation you MUST add some OS dependent options to
-the bareos-sd.conf file:
-
-  Hardware End of Medium = no;
-  Backward Space Record  = no;
-  Backward Space File    = no;
-
-With 2 filemarks at EOT (see man mt):
-  Fast Forward Space File = no;
-  BSF at EOM = yes;
-  TWO EOF    = yes;
-
-With 1 filemarks at EOT (see man mt):
-  Fast Forward Space File = yes;
-  BSF at EOM = no;
-  TWO EOF   = no;
-
-NOTE: YOU CAN SWITCH EOT model ONLY when starting
-      from scratch with EMPTY tapes.
-
-It is also important that all the scripts accessed
-by RunBeforeJob and RunAfterJob will be executed by
-the user bareos.  Check your permissions.
-
-For USB support read the bareos manual. It could be necessary
-to configure/compile a new kernel.
-
-Look at %%PREFIX%%/lib/bareos/scripts/update_bareos_tables for
-database update procedure.
-
-If you are using sqlite you need to run the make_sqlite_tables script as
-the bareos user. Do this using 'sudo su -m bareos'.
-EOM
-}
-]
diff --git a/sysutils/bareos21-server/pkg-descr b/sysutils/bareos21-server/pkg-descr
deleted file mode 100644
index 10fb1ddb3ade..000000000000
--- a/sysutils/bareos21-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Bareos (BackupArchivingRecoveryOpenSourced) is a reliable network open source
-software to backup, archive and restore files from all major operating systems.
-The fork was founded 2010 out of the bacula.org project. The fork has been
-actively developed and many new features have been added.
diff --git a/sysutils/bareos21-server/pkg-plist b/sysutils/bareos21-server/pkg-plist
deleted file mode 100644
index 92d36471b076..000000000000
--- a/sysutils/bareos21-server/pkg-plist
+++ /dev/null
@@ -1,171 +0,0 @@
-bin/bregex
-bin/bsmtp
-bin/bwild
-@sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
-%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample
-%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
-%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
-%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample
-%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
-%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample
-@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
-@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
-%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Rados.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
-@comment @sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample
-%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/RadosStorage.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample
-@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
-%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
-etc/logrotate.d/bareos-dir
-lib/bareos/backends/libbareoscats-%%DBTYPE%%.so
-%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so
-lib/bareos/backends/libbareossd-fifo.so
-lib/bareos/backends/libbareossd-gentape.so
-%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so
-%%RADOS%%lib/bareos/backends/libbareossd-rados.so
-lib/bareos/backends/libbareossd-tape.so
-%%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py
-%%PYTHON%%lib/bareos/plugins/BareosDirWrapper.py
-%%PYTHON%%lib/bareos/plugins/BareosSdPluginBaseclass.py
-%%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py
-lib/bareos/plugins/autoxflate-sd.so
-%%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py
-%%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py
-%%PYTHON%%lib/bareos/plugins/python3-dir.so
-%%PYTHON%%lib/bareos/plugins/python3-sd.so
-%%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so
-%%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so
-lib/bareos/scripts/bareos-ctl-dir
-lib/bareos/scripts/bareos-ctl-sd
-lib/bareos/scripts/bareos-explorer
-lib/bareos/scripts/bareos-glusterfind-wrapper
-lib/bareos/scripts/create_bareos_database
-%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
-%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
-%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql
-%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
-%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2192_2210.sql
-%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
-lib/bareos/scripts/ddl/versions.map
-lib/bareos/scripts/delete_catalog_backup
-lib/bareos/scripts/disk-changer
-lib/bareos/scripts/drop_bareos_database
-lib/bareos/scripts/drop_bareos_tables
-lib/bareos/scripts/grant_bareos_privileges
-lib/bareos/scripts/make_bareos_tables
-lib/bareos/scripts/make_catalog_backup
-lib/bareos/scripts/make_catalog_backup.pl
-lib/bareos/scripts/mtx-changer
-lib/bareos/scripts/query.sql
-lib/bareos/scripts/update_bareos_tables
-lib/libbareoscats.so
-lib/libbareoscats.so.21
-lib/libbareoscats.so.%%LIB_VERSION%%
-%%NDMP%%lib/libbareosndmp.so
-%%NDMP%%lib/libbareosndmp.so.21
-%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
-lib/libbareossd.so
-lib/libbareossd.so.21
-lib/libbareossd.so.%%LIB_VERSION%%
-lib/libbareossql.so
-lib/libbareossql.so.21
-lib/libbareossql.so.%%LIB_VERSION%%
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_EXT_SUFFIX%%.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_EXT_SUFFIX%%.so
-share/man/man1/bareos-tray-monitor.1.gz
-share/man/man1/bregex.1.gz
-share/man/man1/bwild.1.gz
-share/man/man8/bareos-dbcheck.8.gz
-share/man/man8/bareos-dir.8.gz
-share/man/man8/bareos-sd.8.gz
-share/man/man8/bcopy.8.gz
-share/man/man8/bextract.8.gz
-share/man/man8/bls.8.gz
-share/man/man8/bpluginfo.8.gz
-share/man/man8/bscan.8.gz
-share/man/man8/bscrypto.8.gz
-share/man/man8/btape.8.gz
-sbin/bareos-dbcheck
-sbin/bareos-dir
-sbin/bareos-sd
-sbin/bcopy
-sbin/bextract
-sbin/bls
-sbin/bpluginfo
-sbin/bregex
-sbin/bscan
-sbin/bscrypto
-sbin/bsmtp
-sbin/btape
-sbin/btestls
-sbin/bwild
-sbin/chio-bareos
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
-@dir(bareos,bareos,) %%BAREOS_DIR%%
-@dir(bareos,bareos,) %%BAREOS_DIR%%/storage
-@dir(bareos,bareos,) /var/log/bareos
-@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos21-server/pkg-plist.client b/sysutils/bareos21-server/pkg-plist.client
deleted file mode 100644
index 910df16ea4e0..000000000000
--- a/sysutils/bareos21-server/pkg-plist.client
+++ /dev/null
@@ -1,86 +0,0 @@
-bin/bconsole
-@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
-@group bareos
-@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
-@group bareos
-@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
-@group bareos
-@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
-@group bareos
-@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
-@group bareos
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLibcloud.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginMariabackup.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginOvirt.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginPostgres.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginVMware.py
-%%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
-%%PYTHON%%lib/bareos/plugins/BareosLibcloudApi.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-libcloud.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-mariabackup.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-ovirt.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-postgres.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-vmware.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/__init__.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/bucket_explorer.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/debug.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/get_libcloud_driver.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/mtime.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/process_base.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/queue_message.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/utils.py
-%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/worker.py
-lib/bareos/plugins/bpipe-fd.so
-%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
-%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
-%%PYTHON%%lib/bareos/plugins/python3-fd.so
-%%RADOS%%lib/bareos/plugins/rados-fd.so
-lib/bareos/scripts/bareos
-lib/bareos/scripts/bareos-config
-lib/bareos/scripts/bareos-config-lib.sh
-lib/bareos/scripts/bareos-ctl-fd
-lib/bareos/scripts/bareos-ctl-funcs
-lib/bareos/scripts/btraceback.dbx
-lib/bareos/scripts/btraceback.gdb
-lib/bareos/scripts/btraceback.mdb
-lib/libbareos.so
-lib/libbareos.so.21
-lib/libbareos.so.%%LIB_VERSION%%
-lib/libbareosfastlz.so
-lib/libbareosfastlz.so.21
-lib/libbareosfastlz.so.%%LIB_VERSION%%
-lib/libbareosfind.so
-lib/libbareosfind.so.21
-lib/libbareosfind.so.%%LIB_VERSION%%
-lib/libbareoslmdb.so
-lib/libbareoslmdb.so.21
-lib/libbareoslmdb.so.%%LIB_VERSION%%
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_EXT_SUFFIX%%.so
-share/man/man1/bconsole.1.gz
-share/man/man1/bsmtp.1.gz
-share/man/man8/bareos-fd.8.gz
-share/man/man8/bareos.8.gz
-share/man/man8/btraceback.8.gz
-@group bareos
-sbin/bareos
-@group bareos
-sbin/bareos-fd
-@group bareos
-sbin/bconsole
-@group wheel
-sbin/btraceback
-@group bareos
-@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset
-@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job
-@group bareos
-@dir(bareos,bareos,)  %%BAREOS_DIR%%
-@dir(bareos,bareos,) /var/log/bareos
-@dir(bareos,bareos,) /var/run/bareos