aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2023-06-01 19:04:59 +0000
committerRene Ladan <rene@FreeBSD.org>2023-06-01 19:05:08 +0000
commit89e548d925ddd9bbb696fc30b6bcc87dac79b776 (patch)
tree476c9baf7c28d230ae712e4e15c61e07d749f36d
parent0537cfd01d9c8d5b9199104b3a4baad862ca9769 (diff)
downloadports-89e548d925ddd9bbb696fc30b6bcc87dac79b776.tar.gz
ports-89e548d925ddd9bbb696fc30b6bcc87dac79b776.zip
cleanup: Remove expired bareos18 ports:
2023-06-01 sysutils/bareos18-client: Upstream EOL reached on 2020-02-03 2023-06-01 sysutils/bareos18-server: Upstream EOL reached on 2020-02-03 2023-06-01 sysutils/bareos18-traymonitor: Upstream EOL reached on 2020-02-03
-rw-r--r--MOVED3
-rw-r--r--sysutils/Makefile3
-rw-r--r--sysutils/bareos18-client/Makefile26
-rw-r--r--sysutils/bareos18-client/bareos-client/Makefile20
-rw-r--r--sysutils/bareos18-server/Makefile247
-rw-r--r--sysutils/bareos18-server/Makefile.common28
-rw-r--r--sysutils/bareos18-server/distinfo3
-rw-r--r--sysutils/bareos18-server/files/bareos-barcodes51
-rw-r--r--sysutils/bareos18-server/files/bareos-dir.in55
-rw-r--r--sysutils/bareos18-server/files/bareos-fd.in46
-rw-r--r--sysutils/bareos18-server/files/bareos-sd.in37
-rw-r--r--sysutils/bareos18-server/files/chio-bareos190
-rw-r--r--sysutils/bareos18-server/files/patch-core-CMakeLists.txt32
-rw-r--r--sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake34
-rw-r--r--sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake51
-rw-r--r--sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake84
-rw-r--r--sysutils/bareos18-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake15
-rw-r--r--sysutils/bareos18-server/files/patch-core-manpages_CMakeLists.txt19
-rw-r--r--sysutils/bareos18-server/files/patch-core-scripts_CMakeLists.txt75
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-dird_CMakeLists.txt21
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-include_baconfig.h25
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-plugins-dird_python-dir.cc61
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-plugins-filed_CMakeLists.txt35
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc24
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-plugins-filed_python-fd.cc111
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-plugins-stored_python-sd.cc61
-rw-r--r--sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt56
-rw-r--r--sysutils/bareos18-server/files/patch-core-src_CMakeLists.txt25
-rw-r--r--sysutils/bareos18-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake22
-rw-r--r--sysutils/bareos18-server/files/pkg-deinstall.client.in30
-rw-r--r--sysutils/bareos18-server/files/pkg-install.client.in13
-rw-r--r--sysutils/bareos18-server/files/pkg-message.client.in17
-rw-r--r--sysutils/bareos18-server/files/pkg-message.server.in74
-rw-r--r--sysutils/bareos18-server/pkg-descr4
-rw-r--r--sysutils/bareos18-server/pkg-plist179
-rw-r--r--sysutils/bareos18-server/pkg-plist.client60
-rw-r--r--sysutils/bareos18-traymonitor/Makefile26
-rw-r--r--sysutils/bareos18-traymonitor/pkg-descr6
-rw-r--r--sysutils/bareos18-traymonitor/pkg-plist7
39 files changed, 3 insertions, 1873 deletions
diff --git a/MOVED b/MOVED
index 5c2a74f5a4dc..ebb7da836d17 100644
--- a/MOVED
+++ b/MOVED
@@ -7606,3 +7606,6 @@ databases/puppetdb6|databases/puppetdb7|2023-06-01|Has expired: Puppet 6 has rea
databases/puppetdb-terminus6|databases/puppetdb-terminus7|2023-06-01|Has expired: Puppet 6 has reached EOL
sysutils/boxbackup-devel||2023-06-01|Has expired: Requires upstream EOL OpenSSL 1.0.X
www/webstone-ssl||2023-06-01|Has expired: Requires upstream EOL OpenSSL 1.0.X
+sysutils/bareos18-client|sysutils/bareos19-client|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03
+sysutils/bareos18-server|sysutils/bareos19-server|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03
+sysutils/bareos18-traymonitor|sysutils/bareos19-traymonitor|2023-06-01|Has expired: Upstream EOL reached on 2020-02-03
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 1d79cc34947f..1592fa47612b 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -104,9 +104,6 @@
SUBDIR += bareos-client
SUBDIR += bareos-server
SUBDIR += bareos-traymonitor
- SUBDIR += bareos18-client
- SUBDIR += bareos18-server
- SUBDIR += bareos18-traymonitor
SUBDIR += bareos19-client
SUBDIR += bareos19-server
SUBDIR += bareos19-traymonitor
diff --git a/sysutils/bareos18-client/Makefile b/sysutils/bareos18-client/Makefile
deleted file mode 100644
index 5d7dcdd142a1..000000000000
--- a/sysutils/bareos18-client/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME= bareos
-PKGNAMESUFFIX= 18-client
-
-COMMENT= Backup archiving recovery open sourced (client)
-
-BROKEN_aarch64= Fails to link: missing sbrk
-BROKEN_riscv64= Fails to link: missing sbrk
-
-CONFLICTS= bareos17-client bareos16-client bareos-client
-
-WITH_CLIENT_ONLY=yes
-USE_RC_SUBR= bareos-fd
-
-PLIST= ${PKGDIR}/pkg-plist.client
-MASTERDIR= ${.CURDIR}/../../sysutils/bareos18-server
-
-OPTIONS_GROUP= PLUGINS
-OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS
-OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO
-
-CEPHFS_DESC= CEPHFS fd plugin support
-GFAPI_DESC= GFAPI fd plugin support
-RADOS_DESC= RADOS fd plugin support
-LMDB_DESC= Enable build of LMDB support
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos18-client/bareos-client/Makefile b/sysutils/bareos18-client/bareos-client/Makefile
deleted file mode 100644
index 5bcb6afd2c5a..000000000000
--- a/sysutils/bareos18-client/bareos-client/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-
-PORTNAME= bareos
-PKGNAMESUFFIX= -client
-
-COMMENT= Backup archiving recovery open sourced (client)
-
-BROKEN_aarch64= Fails to link: missing sbrk
-
-CONFLICTS= bareos16-client-* bareos17-client-*
-
-WITH_CLIENT_ONLY=yes
-USE_RC_SUBR= bareos-fd
-
-PLIST= ${PKGDIR}/pkg-plist.client
-MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server
-
-OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO
-LMDB_DESC= Enable build of LMDB support
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos18-server/Makefile b/sysutils/bareos18-server/Makefile
deleted file mode 100644
index bd0d7c21ab47..000000000000
--- a/sysutils/bareos18-server/Makefile
+++ /dev/null
@@ -1,247 +0,0 @@
-PORTNAME= bareos
-DISTVERSIONPREFIX= Release/
-DISTVERSION= 18.2.12
-PORTREVISION?= 1
-CATEGORIES?= sysutils
-PKGNAMEPREFIX?= #
-PKGNAMESUFFIX?= 18-server
-
-MAINTAINER= acm@FreeBSD.org
-COMMENT?= Backup archiving recovery open sourced (server)
-WWW= https://www.bareos.org/
-
-LICENSE= AGPLv3 LGPL3
-LICENSE_COMB= multi
-
-DEPRECATED= Upstream EOL reached on 2020-02-03
-EXPIRATION_DATE= 2023-06-01
-
-CONFLICTS?= bareos17-server bareos16-server bareos-server
-
-LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
- libjansson.so:devel/jansson
-
-USES+= cmake:insource compiler:c++11-lang cpe localbase 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
-
-CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-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} == "18-server"
-OPTIONS_GROUP= BACKENDS
-OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
-OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO
-OPTIONS_DEFAULT+= PGSQL SCSICRYPTO
-OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL
-OPTIONS_SINGLE+= DATABASE
-DATABASE_DESC= Database support
-CEPHFS_DESC= CEPHFS backend support
-GFAPI_DESC= GFAPI backend 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} == "18-client" || ${PKGNAMESUFFIX} == "18-server" #Till end of the file
-PYTHON_USES= python
-PYTHON_CMAKE_ON= -Dpython=ON
-PYTHON_CMAKE_OFF= -Dpython=OFF
-PYTHON_PLUGIN= yes
-
-.if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+= libbareos.so:sysutils/bareos18-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=OFF \
- -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 \
- -Dtest-plugin=OFF \
- -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)
-LMDB_CMAKE_ON= -Dlmdb=ON
-LMDB_CMAKE_OFF= -Dlmdb=OFF
-LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
-
-CMAKE_ARGS+= -Dfd-user=root \
- -Dfd-group=wheel
-.else
-CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \
- -Ddir-group=${BAREOS_GROUP} \
- -Dsd-user=${BAREOS_USER} \
- -Dsd-group=operator \
- -Dlmdb=OFF
-.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
-
-MYSQL_CMAKE_ON= -Dmysql=ON
-MYSQL_USES= mysql
-SQLITE3_CMAKE_ON= -Dsqlite3=ON
-SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
-PGSQL_CMAKE_ON= -Dpostgresql=ON
-PGSQL_USES= pgsql
-
-MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-DBTYPE= mysql
-SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""
-.elif ${PORT_OPTIONS:MSQLITE3}
-DBTYPE= sqlite3
-.else
-DBTYPE= postgresql
-SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql
-.endif
-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} '42d' ${WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} -e 's|api/glfs.h|glusterfs/api/glfs.h|g' \
- ${WRKSRC}/core/src/stored/backends/gfapi_device.h
- @${REINPLACE_CMD} -e 's|sm_dump(false)|sm_dump(jcr,false)|g' \
- ${WRKSRC}/core/src/tools/btestls.cc
-.if ${PKGNAMESUFFIX} == "18-server"
- @${REINPLACE_CMD} '23d' ${WRKSRC}/core/src/CMakeLists.txt
- @${REINPLACE_CMD} '25d' ${WRKSRC}/core/src/plugins/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/
- ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${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
- ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample
-.endif
- @${MKDIR} ${STAGEDIR}/var/run/bareos
-.endif
-.else
-.include "${MASTERDIR}/Makefile.common"
-.endif # 18-client and 18-server are defined
-.include <bsd.port.mk>
diff --git a/sysutils/bareos18-server/Makefile.common b/sysutils/bareos18-server/Makefile.common
deleted file mode 100644
index e6c9a2505cc7..000000000000
--- a/sysutils/bareos18-server/Makefile.common
+++ /dev/null
@@ -1,28 +0,0 @@
-post-build:
-.if ${PKGNAMEPREFIX} == "nagios-check_"
- ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
-.endif
-
-pre-install:
-.if ${PKGNAMESUFFIX} == "18-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} == "18-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} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
-.endif
diff --git a/sysutils/bareos18-server/distinfo b/sysutils/bareos18-server/distinfo
deleted file mode 100644
index d4efe597a9d9..000000000000
--- a/sysutils/bareos18-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1636153212
-SHA256 (bareos-bareos-Release-18.2.12_GH0.tar.gz) = 65499d86bc0a41a796f8a6aaef3e32cb324f39f3300cf32927a84e0fd3a35075
-SIZE (bareos-bareos-Release-18.2.12_GH0.tar.gz) = 10566403
diff --git a/sysutils/bareos18-server/files/bareos-barcodes b/sysutils/bareos18-server/files/bareos-barcodes
deleted file mode 100644
index f42cb7f7aeea..000000000000
--- a/sysutils/bareos18-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/bareos18-server/files/bareos-dir.in b/sysutils/bareos18-server/files/bareos-dir.in
deleted file mode 100644
index 86b62370cbb7..000000000000
--- a/sysutils/bareos18-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}"
-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/bareos18-server/files/bareos-fd.in b/sysutils/bareos18-server/files/bareos-fd.in
deleted file mode 100644
index 54647786b12c..000000000000
--- a/sysutils/bareos18-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}"
-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/bareos18-server/files/bareos-sd.in b/sysutils/bareos18-server/files/bareos-sd.in
deleted file mode 100644
index a5efe78e80f7..000000000000
--- a/sysutils/bareos18-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}"
-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/bareos18-server/files/chio-bareos b/sysutils/bareos18-server/files/chio-bareos
deleted file mode 100644
index f006ef78e6ce..000000000000
--- a/sysutils/bareos18-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/bareos18-server/files/patch-core-CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-CMakeLists.txt
deleted file mode 100644
index c98c93487bd4..000000000000
--- a/sysutils/bareos18-server/files/patch-core-CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
---- core/CMakeLists.txt 2020-12-11 10:27:01.000000000 -0500
-+++ core/CMakeLists.txt 2020-12-14 21:56:05.412121000 -0500
-@@ -115,7 +115,9 @@
- set(PSCMD "ps -ax -o pid,command")
- include_directories(/usr/local/include)
- link_directories(/usr/local/lib)
-- link_libraries(intl)
-+ IF(nls)
-+ link_libraries(intl)
-+ ENDIF()
- endif()
-
- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-@@ -187,7 +189,9 @@
- add_definitions("-D_FILE_OFFSET_BITS=64")
- endif()
-
--include(FindIntl)
-+IF(nls)
-+ include(FindIntl)
-+ENDIF()
-
- if(developer)
- add_definitions("-DDEVELOPER=1")
-@@ -600,7 +604,6 @@
-
- add_subdirectory(scripts)
- add_subdirectory(manpages)
--add_subdirectory(platforms)
- add_subdirectory(src)
-
- string(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S")
diff --git a/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake
deleted file mode 100644
index 6e4b63777a70..000000000000
--- a/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
---- core/cmake/BareosCheckIncludes.cmake 2020-12-14 22:02:44.192311000 -0500
-+++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 22:06:25.053879000 -0500
-@@ -103,20 +103,20 @@
- CHECK_INCLUDE_FILES(sys/xattr.h HAVE_SYS_XATTR_H)
- CHECK_INCLUDE_FILES(api/glfs.h HAVE_API_GLFS_H)
-
--CHECK_INCLUDE_FILES(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H)
-+if(cephfs)
-+ CHECK_INCLUDE_FILES(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H)
-+ CHECK_INCLUDE_FILES("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPHFS_CEPH_STATX_H)
-+endif()
-
--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_CEPHFS_CEPH_STATX_H)
--cmake_pop_check_state()
-+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(rados/librados.h HAVE_RADOS_LIBRADOS_H)
--CHECK_INCLUDE_FILES(radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H)
--
- #CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H)
--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(elasto/data.h HAVE_ELASTO_DATA_H)
- CHECK_INCLUDE_FILES(elasto/file.h HAVE_ELASTO_FILE_H)
diff --git a/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
deleted file mode 100644
index 72fb0630a5fa..000000000000
--- a/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
---- core/cmake/BareosFindAllLibraries.cmake 2020-12-11 10:27:01.000000000 -0500
-+++ core/cmake/BareosFindAllLibraries.cmake 2020-12-14 22:52:06.210892000 -0500
-@@ -25,13 +25,15 @@
-
-
- if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-- # make sure we get python 2 not 3
-- set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9)
-- find_package(PythonInterp)
-- INCLUDE(FindPythonLibs)
-+ if (python)
-+ # make sure we get python 2 or 3
-+ set(Python_ADDITIONAL_VERSIONS 3.5 3.6 3.7 3.8 2.7)
-+ find_package(PythonInterp)
-+ INCLUDE(FindPythonLibs)
-
-- if (${PYTHONLIBS_FOUND})
-- SET(HAVE_PYTHON 1)
-+ if (${PYTHONLIBS_FOUND})
-+ SET(HAVE_PYTHON 1)
-+ endif()
- endif()
-
- INCLUDE(FindPostgreSQL)
-@@ -52,13 +54,21 @@
-
- BareosFindLibraryAndHeaders("fastlz" "fastlzlib.h")
- BareosFindLibraryAndHeaders("jansson" "jansson.h")
--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")
--BareosFindLibraryAndHeaders("droplet" "droplet.h")
-+if(gfapi)
-+ BareosFindLibraryAndHeaders("gfapi" "glusterfs/api/glfs.h")
-+endif()
-+if(droplet)
-+ BareosFindLibraryAndHeaders("droplet" "droplet.h")
-+endif()
-
- BareosFindLibraryAndHeaders("pam" "security/pam_appl.h")
-
diff --git a/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
deleted file mode 100644
index b8a136bc5eae..000000000000
--- a/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
+++ /dev/null
@@ -1,84 +0,0 @@
---- core/cmake/BareosInstallConfigFiles.cmake 2020-12-11 10:27:01.000000000 -0500
-+++ core/cmake/BareosInstallConfigFiles.cmake 2020-12-15 01:25:25.641687000 -0500
-@@ -43,18 +43,9 @@
- get_filename_component(resname ${resdir} NAME)
- foreach(configfile ${configfiles})
- get_filename_component(fname ${configfile} NAME)
-- if (EXISTS ${DESTCONFDIR}/${resname}/${fname})
-- MESSAGE(STATUS "${DESTCONFDIR}/${resname}/${fname} exists")
-- MESSAGE(STATUS "rename ${configfile} to ${configfile}.new")
-- FILE (RENAME "${configfile}" "${configfile}.new")
--
-- MESSAGE(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
-- FILE (INSTALL "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
-- FILE (RENAME "${configfile}.new" "${configfile}")
-- else()
-- MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)")
-- FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
-- endif()
-+ MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)")
-+ FILE (RENAME "${configfile}" "${configfile}.sample")
-+ FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}")
- endforeach()
- endforeach()
-
-@@ -82,21 +73,16 @@
- 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}")
-+ FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
-+ FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}")
- endforeach()
-
- file(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.example")
- 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}")
-@@ -104,7 +90,8 @@
- 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()
-@@ -122,15 +109,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/bareos18-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
deleted file mode 100644
index ce294505c385..000000000000
--- a/sysutils/bareos18-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- core/cmake/BareosSetVariableDefaults.cmake 2019-05-10 11:53:19.620402000 -0500
-+++ core/cmake/BareosSetVariableDefaults.cmake 2019-05-10 12:13:55.910452000 -0500
-@@ -669,7 +669,11 @@
- SET(PACKAGE_URL "\"\"")
- SET(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
-
--set(ENABLE_NLS 1)
-+IF(DEFINED nls)
-+ SET(ENABLE_NLS 1)
-+ELSE()
-+ SET(ENABLE_NLS 0)
-+ENDIF()
-
-
- IF(HAVE_WIN32)
diff --git a/sysutils/bareos18-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-manpages_CMakeLists.txt
deleted file mode 100644
index ab5442b9a2ba..000000000000
--- a/sysutils/bareos18-server/files/patch-core-manpages_CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- core/manpages/CMakeLists.txt 2019-05-08 21:16:29.369799000 -0500
-+++ core/manpages/CMakeLists.txt 2019-05-08 21:17:28.526607000 -0500
-@@ -17,6 +17,7 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- # 02110-1301, USA.
-
-+IF(client-only)
- set (MAN1
- bconsole.1
- )
-@@ -25,7 +26,7 @@
- bareos-fd.8
- bareos.8
- )
--
-+ENDIF()
-
- IF(NOT client-only)
- set ( MAN1-server
diff --git a/sysutils/bareos18-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-scripts_CMakeLists.txt
deleted file mode 100644
index 44c774124482..000000000000
--- a/sysutils/bareos18-server/files/patch-core-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,75 +0,0 @@
---- core/scripts/CMakeLists.txt 2019-12-12 12:04:14.000000000 -0500
-+++ core/scripts/CMakeLists.txt 2019-12-28 16:23:36.207715000 -0500
-@@ -17,36 +17,37 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- # 02110-1301, USA.
-
-+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 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
-+ btraceback.gdb
-+ btraceback.dbx
-+ btraceback.mdb
-+ bareos-config
-+ bareos-config-lib.sh
-+ bareos-ctl-funcs
-+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-+ GROUP_READ GROUP_EXECUTE
-+ WORLD_READ WORLD_EXECUTE
-+ DESTINATION "${scriptdir}"
-+ )
-+ENDIF()
-
--INSTALL(FILES
-- bareos
-- btraceback.gdb
-- btraceback.dbx
-- btraceback.mdb
-- bareos-config
-- bareos-config-lib.sh
-- bareos-ctl-funcs
-- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-- GROUP_READ GROUP_EXECUTE
-- WORLD_READ WORLD_EXECUTE
-- DESTINATION "${scriptdir}"
-- )
--
- IF(NOT client-only)
- INSTALL(FILES
- mtx-changer
-@@ -55,7 +56,6 @@
- bareos-glusterfind-wrapper
- bareos-ctl-dir
- bareos-ctl-sd
-- bareos-ctl-funcs
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
diff --git a/sysutils/bareos18-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src-dird_CMakeLists.txt
deleted file mode 100644
index 11570458e8e4..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-dird_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- core/src/dird/CMakeLists.txt 2019-05-08 21:45:45.893113000 -0500
-+++ core/src/dird/CMakeLists.txt 2019-05-08 21:47:00.616203000 -0500
-@@ -77,6 +77,9 @@
- bareosfind
- ${LMDB_LIBS}
- ${NDMP_LIBS}
-+ ${OPENSSL_LIBRARIES}
-+ ${PTHREAD_LIBRARIES}
-+ ${JANSSON_LIBRARIES}
- )
-
- IF(HAVE_WIN32)
-@@ -92,7 +95,7 @@
- add_executable(bareos-dbcheck ${DBCHKSRCS})
- SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)
-
--target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES})
-+target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES})
-
- # is not built by default
-
diff --git a/sysutils/bareos18-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos18-server/files/patch-core-src-include_baconfig.h
deleted file mode 100644
index 4a9a9b5e839f..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-include_baconfig.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- core/src/include/baconfig.h 2019-05-10 14:32:06.160940000 -0500
-+++ core/src/include/baconfig.h 2019-05-10 14:32:32.142847000 -0500
-@@ -120,11 +120,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)
-@@ -137,9 +137,6 @@
- #endif
- #ifndef bindtextdomain
- #define bindtextdomain(p, d)
-- #endif
-- #ifndef setlocale
-- #define setlocale(p, d)
- #endif
- #endif /* ENABLE_NLS */
-
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-dird_python-dir.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-dird_python-dir.cc
deleted file mode 100644
index f63db632d130..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-plugins-dird_python-dir.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- core/src/plugins/dird/python-dir.cc 2019-12-12 12:04:14.000000000 -0500
-+++ core/src/plugins/dird/python-dir.cc 2019-12-29 00:20:30.334502000 -0500
-@@ -35,6 +35,13 @@
- #error "Need at least Python version 2.6 or newer"
- #endif
-
-+#if (PY_VERSION_HEX > 0x03050000)
-+#define PyInt_AsLong PyLong_AsLong
-+#define PyInt_FromLong PyLong_FromLong
-+#define PyString_AsString PyUnicode_AsUTF8
-+#define PyString_FromString PyUnicode_FromString
-+#endif
-+
- #include "python-dir.h"
- #include "lib/edit.h"
-
-@@ -118,6 +125,20 @@
- */
- static PyThreadState *mainThreadState;
-
-+#if (PY_VERSION_HEX > 0x03050000)
-+static struct PyModuleDef BareosDIRModuleDef = {
-+ PyModuleDef_HEAD_INIT,
-+ "bareosdir",
-+ NULL,
-+ -1,
-+ BareosDIRMethods,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL
-+};
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -679,7 +700,11 @@
- /*
- * Make our callback methods available for Python.
- */
-+#if (PY_VERSION_HEX > 0x03050000)
-+ p_ctx->pInstance = PyModule_Create(&BareosDIRModuleDef);
-+#else
- p_ctx->pInstance = Py_InitModule("bareosdir", BareosDIRMethods);
-+#endif
- }
-
- /*
-@@ -959,7 +984,11 @@
- char *value;
-
- ctx = PyGetbpContext(pyCtx);
-+#if (PY_VERSION_HEX > 0x03050000)
-+ value = bstrdup(PyString_AsString(pyValue));
-+#else
- value = PyString_AsString(pyValue);
-+#endif
- if (value) {
- retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value);
- }
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_CMakeLists.txt
deleted file mode 100644
index 5c59efaffb08..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
---- core/src/plugins/filed/CMakeLists.txt 2019-12-12 12:04:14.000000000 -0500
-+++ core/src/plugins/filed/CMakeLists.txt 2019-12-28 16:26:47.855833000 -0500
-@@ -100,18 +100,18 @@
- INSTALL(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon)
- endif()
-
--set (PYFILES
-- bareos-fd.py.template
-- bareos-fd-local-fileset.py
-- bareos-fd-mock-test.py
-- BareosFdPluginBaseclass.py
-- BareosFdPluginLocalFileset.py
-- BareosFdWrapper.py
-- bareos_fd_consts.py
-- bareos-fd-ldap.py
-- BareosFdPluginLDAP.py
-- )
-+if (python)
-+ set (PYFILES
-+ bareos-fd.py.template
-+ bareos-fd-local-fileset.py
-+ bareos-fd-mock-test.py
-+ BareosFdPluginBaseclass.py
-+ BareosFdPluginLocalFileset.py
-+ BareosFdWrapper.py
-+ bareos_fd_consts.py
-+ bareos-fd-ldap.py
-+ BareosFdPluginLDAP.py
-+ )
-
--INSTALL(FILES ${PYFILES} DESTINATION ${plugindir} COMPONENT filedaemon)
--
--
-+ INSTALL(FILES ${PYFILES} DESTINATION ${plugindir} COMPONENT filedaemon)
-+endif()
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc
deleted file mode 100644
index e796a1b23d51..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- core/src/plugins/filed/gfapi-fd.cc 2020-12-14 23:47:04.832213000 -0500
-+++ core/src/plugins/filed/gfapi-fd.cc 2020-12-14 23:47:56.824952000 -0500
-@@ -30,7 +30,7 @@
- #include "lib/path_list.h"
- #include "lib/edit.h"
-
--#include <api/glfs.h>
-+#include <glusterfs/api/glfs.h>
-
-
- /* avoid missing config.h problem on Debian 8 and Ubuntu 16:
-@@ -39,10 +39,10 @@
- */
- #ifndef _CONFIG_H
- #define _CONFIG_H
--#include <compat-errno.h>
-+#include <glusterfs/compat-errno.h>
- #undef _CONFIG_H
- #else
--#include <compat-errno.h>
-+#include <glusterfs/compat-errno.h>
- #endif
-
- namespace filedaemon {
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_python-fd.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_python-fd.cc
deleted file mode 100644
index 3e48800f4da6..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_python-fd.cc
+++ /dev/null
@@ -1,111 +0,0 @@
---- core/src/plugins/filed/python-fd.cc 2019-12-12 12:04:14.000000000 -0500
-+++ core/src/plugins/filed/python-fd.cc 2019-12-29 00:41:38.985785000 -0500
-@@ -40,6 +40,14 @@
- #error "Need at least Python version 2.6 or newer"
- #endif
-
-+#if (PY_VERSION_HEX > 0x03050000)
-+#define PyInt_AsLong PyLong_AsLong
-+#define PyInt_FromLong PyLong_FromLong
-+#define PyString_AsString PyUnicode_AsUTF8
-+#define PyString_FromString PyUnicode_FromString
-+#define PyString_Check PyBytes_Check
-+#endif
-+
- static const int debuglevel = 150;
-
- #define PLUGIN_LICENSE "Bareos AGPLv3"
-@@ -163,6 +171,20 @@
- */
- static PyThreadState *mainThreadState;
-
-+#if (PY_VERSION_HEX > 0x03050000)
-+static struct PyModuleDef BareosFDModuleDef = {
-+ PyModuleDef_HEAD_INIT,
-+ "bareosfd",
-+ NULL,
-+ -1,
-+ BareosFDMethods,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL
-+};
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -1226,7 +1248,11 @@
- /*
- * Make our callback methods available for Python.
- */
-+#if (PY_VERSION_HEX > 0x03050000)
-+ p_ctx->pInstance = PyModule_Create(&BareosFDModuleDef);
-+#else
- p_ctx->pInstance = Py_InitModule("bareosfd", BareosFDMethods);
-+#endif
-
- /*
- * Fill in the slots of PyRestoreObject
-@@ -2704,7 +2730,11 @@
- case bVarFileSeen: {
- char *value;
-
-+#if (PY_VERSION_HEX > 0x03050000)
-+ value = bstrdup(PyString_AsString(pyValue));
-+#else
- value = PyString_AsString(pyValue);
-+#endif
- if (value) {
- retval = bfuncs->setBareosValue(ctx, (bVariable)var, value);
- }
-@@ -3091,7 +3121,11 @@
- sp.type = pSavePkt->type;
- if (pSavePkt->fname) {
- if (PyString_Check(pSavePkt->fname)) {
-+#if (PY_VERSION_HEX > 0x03050000)
-+ sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
-+#else
- sp.fname = PyString_AsString(pSavePkt->fname);
-+#endif
- } else {
- goto bail_out;
- }
-@@ -3100,7 +3134,11 @@
- }
- if (pSavePkt->link) {
- if (PyString_Check(pSavePkt->link)) {
-+#if (PY_VERSION_HEX > 0x03050000)
-+ sp.link = bstrdup(PyString_AsString(pSavePkt->link));
-+#else
- sp.link = PyString_AsString(pSavePkt->link);
-+#endif
- } else {
- goto bail_out;
- }
-@@ -3143,7 +3181,11 @@
- */
- if (pSavePkt->fname) {
- if (PyString_Check(pSavePkt->fname)) {
-+#if (PY_VERSION_HEX > 0x03050000)
-+ sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
-+#else
- sp.fname = PyString_AsString(pSavePkt->fname);
-+#endif
- } else {
- goto bail_out;
- }
-@@ -3219,8 +3261,11 @@
- if (!object || !PyString_Check(object)) {
- return (char *)"";
- }
--
-+#if (PY_VERSION_HEX > 0x03050000)
-+ return bstrdup(PyString_AsString(object));
-+#else
- return PyString_AsString(object);
-+#endif
- }
-
- static inline char *PyGetByteArrayValue(PyObject *object)
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-stored_python-sd.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-stored_python-sd.cc
deleted file mode 100644
index fb84a03d80ef..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-plugins-stored_python-sd.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- core/src/plugins/stored/python-sd.cc 2019-12-12 12:04:14.000000000 -0500
-+++ core/src/plugins/stored/python-sd.cc 2019-12-29 00:19:19.366390000 -0500
-@@ -36,6 +36,13 @@
- #error "Need at least Python version 2.6 or newer"
- #endif
-
-+#if (PY_VERSION_HEX > 0x03050000)
-+#define PyInt_AsLong PyLong_AsLong
-+#define PyInt_FromLong PyLong_FromLong
-+#define PyString_AsString PyUnicode_AsUTF8
-+#define PyString_FromString PyUnicode_FromString
-+#endif
-+
- static const int debuglevel = 150;
-
- #define PLUGIN_LICENSE "Bareos AGPLv3"
-@@ -121,6 +128,20 @@
- extern "C" {
- #endif
-
-+#if (PY_VERSION_HEX > 0x03050000)
-+static struct PyModuleDef BareosSDModuleDef = {
-+ PyModuleDef_HEAD_INIT,
-+ "bareossd",
-+ NULL,
-+ -1,
-+ BareosSDMethods,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL
-+};
-+#endif
-+
- /**
- * loadPlugin() and unloadPlugin() are entry points that are
- * exported, so Bareos can directly call these two entry points
-@@ -698,7 +719,11 @@
- /*
- * Make our callback methods available for Python.
- */
-+#if (PY_VERSION_HEX > 0x03050000)
-+ p_ctx->pInstance = PyModule_Create(&BareosSDModuleDef);
-+#else
- p_ctx->pInstance = Py_InitModule("bareossd", BareosSDMethods);
-+#endif
- }
-
- /*
-@@ -979,7 +1004,11 @@
- char *value;
-
- ctx = PyGetbpContext(pyCtx);
-+#if (PY_VERSION_HEX > 0x03050000)
-+ value = bstrdup(PyString_AsString(pyValue));
-+#else
- value = PyString_AsString(pyValue);
-+#endif
- if (value) {
- bfuncs->setBareosValue(ctx, (bsdwVariable)var, value);
- }
diff --git a/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt
deleted file mode 100644
index 30ea5dd024d0..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
---- core/src/stored/CMakeLists.txt 2021-09-13 03:57:27.000000000 -0500
-+++ core/src/stored/CMakeLists.txt 2022-03-04 20:39:26.209621000 -0500
-@@ -193,26 +193,35 @@
- target_link_libraries(bareos-sd
- stored_objects
- ${BAREOS_SD_LIBRARIES}
-+ ${JANSSON_LIBRARIES}
-+ ${PTHREAD_LIBRARIES}
- )
-
- add_executable(bls ${BLSSRCS})
- target_link_libraries(bls
- bareos bareossd bareosfind
-+ ${JANSSON_LIBRARIES}
-+ ${PTHREAD_LIBRARIES}
- )
-
- add_executable(bextract ${BEXTRACTSRS})
- target_link_libraries(bextract
- bareossd bareosfind bareos
-+ ${JANSSON_LIBRARIES}
-+ ${PTHREAD_LIBRARIES}
- )
-
- add_executable(bscan ${BSCANSRCS})
- target_link_libraries(bscan
- bareos bareossd bareosfind bareossql bareoscats
-+ ${PTHREAD_LIBRARIES}
- )
-
- add_executable(btape ${BTAPESRCS})
- target_link_libraries(btape
- bareossd bareos
-+ ${JANSSON_LIBRARIES}
-+ ${PTHREAD_LIBRARIES}
- )
-
- add_executable(bcopy ${BCOPYSRCS})
-@@ -220,6 +229,8 @@
-
- target_link_libraries(bcopy
- bareossd bareos
-+ ${JANSSON_LIBRARIES}
-+ ${PTHREAD_LIBRARIES}
- )
-
- INSTALL(TARGETS bareossd DESTINATION ${libdir})
-@@ -232,7 +243,7 @@
- install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
- install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake)
-
--INSTALL(DIRECTORY DESTINATION "../${archivedir}")
-+INSTALL(DIRECTORY DESTINATION "${archivedir}")
-
- IF(${HAVE_DYNAMIC_SD_BACKENDS})
- add_subdirectory(backends)
diff --git a/sysutils/bareos18-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src_CMakeLists.txt
deleted file mode 100644
index 135d70a4df4c..000000000000
--- a/sysutils/bareos18-server/files/patch-core-src_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- core/src/CMakeLists.txt 2019-05-08 21:29:08.173605000 -0500
-+++ core/src/CMakeLists.txt 2019-05-08 21:42:27.597876000 -0500
-@@ -30,13 +30,16 @@
- add_subdirectory(stored)
- ENDIF()
-
--add_subdirectory(console)
--IF(${HAVE_LMDB})
--add_subdirectory(lmdb)
-+IF(client-only)
-+ add_subdirectory(console)
-+ IF(${HAVE_LMDB})
-+ add_subdirectory(lmdb)
-+ ENDIF()
-+ add_subdirectory(lib)
-+ add_subdirectory(findlib)
-+ add_subdirectory(filed)
- ENDIF()
--add_subdirectory(lib)
--add_subdirectory(findlib)
--add_subdirectory(filed)
-+
- add_subdirectory(plugins)
-
- if (${traymonitor})
diff --git a/sysutils/bareos18-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos18-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
deleted file mode 100644
index 811950bd6a2d..000000000000
--- a/sysutils/bareos18-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
---- core/cmake/bareos-symlink-default-db-backend.cmake.orig 2021-04-13 21:34:51 UTC
-+++ core/cmake/bareos-symlink-default-db-backend.cmake
-@@ -16,8 +16,17 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- # 02110-1301, USA.
-+
- MESSAGE(STATUS "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+# 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).
-+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/bareos18-server/files/pkg-deinstall.client.in b/sysutils/bareos18-server/files/pkg-deinstall.client.in
deleted file mode 100644
index 3be8c2e4874c..000000000000
--- a/sysutils/bareos18-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%%
-BACULA_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/bareos18-server/files/pkg-install.client.in b/sysutils/bareos18-server/files/pkg-install.client.in
deleted file mode 100644
index 70ca57028237..000000000000
--- a/sysutils/bareos18-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/bareos18-server/files/pkg-message.client.in b/sysutils/bareos18-server/files/pkg-message.client.in
deleted file mode 100644
index b3e2d5825e13..000000000000
--- a/sysutils/bareos18-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/bareos18-server/files/pkg-message.server.in b/sysutils/bareos18-server/files/pkg-message.server.in
deleted file mode 100644
index 3bb0ef535ce1..000000000000
--- a/sysutils/bareos18-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/bareos18-server/pkg-descr b/sysutils/bareos18-server/pkg-descr
deleted file mode 100644
index 10fb1ddb3ade..000000000000
--- a/sysutils/bareos18-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/bareos18-server/pkg-plist b/sysutils/bareos18-server/pkg-plist
deleted file mode 100644
index 2079cd910c04..000000000000
--- a/sysutils/bareos18-server/pkg-plist
+++ /dev/null
@@ -1,179 +0,0 @@
-bin/bregex
-bin/bsmtp
-bin/bwild
-bin/timelimit
-@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
-%%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
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
-%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.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.sampl
-@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/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
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
-@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
-@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
-lib/bareos/backends/libbareossd-fifo.so
-lib/bareos/backends/libbareossd-gentape.so
-%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.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-dir.py.template
-%%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py
-%%PYTHON%%lib/bareos/plugins/bareos-sd.py.template
-%%PYTHON%%lib/bareos/plugins/bareos_dir_consts.py
-%%PYTHON%%lib/bareos/plugins/bareos_sd_consts.py
-%%PYTHON%%lib/bareos/plugins/python-dir.so
-%%PYTHON%%lib/bareos/plugins/python-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
-%%MYSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
-%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
-%%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
-%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
-%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql
-%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
-%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
-%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.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
-%%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.18
-lib/libbareoscats.so.%%LIB_VERSION%%
-%%NDMP%%lib/libbareosndmp.so
-%%NDMP%%lib/libbareosndmp.so.18
-%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
-lib/libbareossd.so
-lib/libbareossql.so
-lib/libbareossql.so.18
-lib/libbareossql.so.%%LIB_VERSION%%
-share/man/man1/bareos-tray-monitor.1.gz
-share/man/man1/bregex.1.gz
-share/man/man1/bsmtp.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
-share/man/man8/btraceback.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
-sbin/timelimit
-@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-export
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage
-@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/bareos18-server/pkg-plist.client b/sysutils/bareos18-server/pkg-plist.client
deleted file mode 100644
index 41890e0a216f..000000000000
--- a/sysutils/bareos18-server/pkg-plist.client
+++ /dev/null
@@ -1,60 +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
-lib/libbareos.so
-lib/libbareos.so.18
-lib/libbareos.so.%%LIB_VERSION%%
-lib/libbareosfind.so
-lib/libbareosfind.so.18
-lib/libbareosfind.so.%%LIB_VERSION%%
-%%LMDB%%lib/libbareoslmdb.so
-%%LMDB%%lib/libbareoslmdb.so.18
-%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
-%%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
-%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
-lib/bareos/plugins/bpipe-fd.so
-lib/bareos/plugins/test-plugin-fd.so
-%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
-%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
-%%PYTHON%%lib/bareos/plugins/python-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
-share/man/man1/bconsole.1.gz
-share/man/man8/bareos-fd.8.gz
-share/man/man8/bareos.8.gz
-@group bareos
-sbin/bareos
-@group bareos
-sbin/bareos-fd
-@group bareos
-sbin/bconsole
-@group wheel
-sbin/btraceback
-@group bareos
-%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset
-%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job
-@dir(bareos,bareos,) %%BAREOS_DIR%%
-@dir(bareos,bareos,) /var/log/bareos
-@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos18-traymonitor/Makefile b/sysutils/bareos18-traymonitor/Makefile
deleted file mode 100644
index d716a3f173a9..000000000000
--- a/sysutils/bareos18-traymonitor/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME= bareos
-PORTREVISION= 1
-PKGNAMESUFFIX= 18-traymonitor
-
-COMMENT= Backup archiving recovery open sourced (traymonitor)
-
-LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
- libbareos.so:sysutils/bareos18-client
-
-CONFLICTS= bacula*-bat bareos-traymonitor
-
-USES= pkgconfig gettext-runtime desktop-file-utils qt:5
-USE_QT= buildtools:build qmake:build uitools:build gui core widgets
-WITH_BAT= yes
-
-PLIST= ${.CURDIR}/pkg-plist
-CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
-
-MASTERDIR= ${.CURDIR}/../../sysutils/bareos18-server
-
-CMAKE_ARGS+= -Dtraymonitor=yes \
- -Dbuild-dird=no \
- -Dbuild-stored=no \
- -Dclient-only=yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos18-traymonitor/pkg-descr b/sysutils/bareos18-traymonitor/pkg-descr
deleted file mode 100644
index 5df5acf72ccf..000000000000
--- a/sysutils/bareos18-traymonitor/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-traymonitor inteface for Bareos.
-
-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/bareos18-traymonitor/pkg-plist b/sysutils/bareos18-traymonitor/pkg-plist
deleted file mode 100644
index add26cb88d6d..000000000000
--- a/sysutils/bareos18-traymonitor/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/bareos-tray-monitor
-@sample %%ETCDIR%%/tray-monitor.d/client/FileDaemon-local.conf.sample
-@sample %%ETCDIR%%/tray-monitor.d/director/Director-local.conf.sample
-@sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample
-@sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample
-share/applications/bareos-tray-monitor.desktop
-share/pixmaps/bareos-tray-monitor.xpm