Index: head/sysutils/bareos-client/Makefile
===================================================================
--- head/sysutils/bareos-client/Makefile	(revision 566125)
+++ head/sysutils/bareos-client/Makefile	(revision 566126)
@@ -1,25 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
 CONFLICTS=	bareos19-client-* bareos18-client-* bareos17-client-*
 
 WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bareos-fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
 
 OPTIONS_GROUP=	PLUGINS
 OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS
-OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
+OPTIONS_DEFINE=	NLS PYTHON 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"
Index: head/sysutils/bareos-server/Makefile
===================================================================
--- head/sysutils/bareos-server/Makefile	(revision 566125)
+++ head/sysutils/bareos-server/Makefile	(revision 566126)
@@ -1,240 +1,243 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	20.0.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
 
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
 CONFLICTS?=	bacula19*-server bacula18*-server-* bareos17-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
 
 USES+=		cmake compiler:c++11-lang localbase perl5 pkgconfig readline:port \
 		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} == "-server"
 OPTIONS_GROUP=  BACKENDS
 OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
-OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
-OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
+OPTIONS_DEFINE=		MTX PYTHON LMDB NDMP NLS SCSICRYPTO
+OPTIONS_DEFAULT+=	LMDB PGSQL SCSICRYPTO
 OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL 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} == "-client" || ${PKGNAMESUFFIX} == "-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/bareos-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+=	-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
+		-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
 
 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}  '76,79d' ${WRKSRC}/CMakeLists.txt
 .if ${PKGNAMESUFFIX} == "-server"
 	@${REINPLACE_CMD}  '51d' ${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 # -client and -server are defined
 .include <bsd.port.mk>
Index: head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt
===================================================================
--- head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt	(revision 566125)
+++ head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt	(revision 566126)
@@ -1,30 +1,32 @@
 --- core/src/stored/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
-+++ core/src/stored/CMakeLists.txt	2020-12-23 23:06:49.516519000 -0500
++++ core/src/stored/CMakeLists.txt	2021-02-19 16:15:32.925944000 -0500
 @@ -226,23 +226,23 @@
    list(APPEND BAREOS_SD_LIBRARIES comctl32)
  endif()
  
 -target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES})
 +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)
+-target_link_libraries(bls bareos bareossd bareosfind)
++target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES})
  
  add_executable(bextract ${BEXTRACTSRS})
 -target_link_libraries(bextract bareossd bareosfind bareos)
 +target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  add_executable(bscan ${BSCANSRCS})
- target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
+-target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
++target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES})
  
  add_executable(btape ${BTAPESRCS})
 -target_link_libraries(btape bareossd bareos)
 +target_link_libraries(btape bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  add_executable(bcopy ${BCOPYSRCS})
  
 -target_link_libraries(bcopy bareossd bareos)
 +target_link_libraries(bcopy bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  install(TARGETS bareossd DESTINATION ${libdir})
  
Index: head/sysutils/bareos-server/pkg-plist.client
===================================================================
--- head/sysutils/bareos-server/pkg-plist.client	(revision 566125)
+++ head/sysutils/bareos-server/pkg-plist.client	(revision 566126)
@@ -1,81 +1,81 @@
 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/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-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.20
 lib/libbareos.so.%%LIB_VERSION%%
 lib/libbareosfastlz.so
 lib/libbareosfastlz.so.20
 lib/libbareosfastlz.so.%%LIB_VERSION%%
 lib/libbareosfind.so
 lib/libbareosfind.so.20
 lib/libbareosfind.so.%%LIB_VERSION%%
-%%LMDB%%lib/libbareoslmdb.so
-%%LMDB%%lib/libbareoslmdb.so.20
-%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
+lib/libbareoslmdb.so
+lib/libbareoslmdb.so.20
+lib/libbareoslmdb.so.%%LIB_VERSION%%
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd.so
 man/man1/bconsole.1.gz
 man/man8/bareos-fd.8.gz
 man/man8/bareos.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
 @group bareos
 @dir(bareos,bareos,)  %%BAREOS_DIR%%
 @dir(bareos,bareos,) /var/log/bareos
 @dir(bareos,bareos,) /var/run/bareos