diff --git a/sysutils/bareos20-server/Makefile b/sysutils/bareos20-server/Makefile
index 50b469964dd9..cb5eb245a7ab 100644
--- a/sysutils/bareos20-server/Makefile
+++ b/sysutils/bareos20-server/Makefile
@@ -1,243 +1,243 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	20.0.7
+DISTVERSION=	20.0.8
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	20-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
 WWW=		https://www.bareos.org/
 
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
 CONFLICTS?=	bareos19-server bareos18-server bareos-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
 
 USES+=		cmake 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} == "20-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=	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} == "20-client" || ${PKGNAMESUFFIX} == "20-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/bareos20-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
 
 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} == "20-server"
 	@${REINPLACE_CMD}  '45d' ${WRKSRC}/core/src/CMakeLists.txt
 	@${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>
diff --git a/sysutils/bareos20-server/distinfo b/sysutils/bareos20-server/distinfo
index 3a6ee41181df..360b78388f29 100644
--- a/sysutils/bareos20-server/distinfo
+++ b/sysutils/bareos20-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667250604
-SHA256 (bareos-bareos-Release-20.0.7_GH0.tar.gz) = b92e46750883e53ef763d426626cc0dea5ea80442dae647a983f348c8b9aeb38
-SIZE (bareos-bareos-Release-20.0.7_GH0.tar.gz) = 13429660
+TIMESTAMP = 1668638535
+SHA256 (bareos-bareos-Release-20.0.8_GH0.tar.gz) = b8408d6a1a966fa97d02d727b1f92bb7ed40c7a34d5b66f118f1a09b1a8edaa3
+SIZE (bareos-bareos-Release-20.0.8_GH0.tar.gz) = 13429247
diff --git a/sysutils/bareos20-server/files/patch-core-CMakeLists.txt b/sysutils/bareos20-server/files/patch-core-CMakeLists.txt
index 7adbdb29fefa..aaa58e70bf3c 100644
--- a/sysutils/bareos20-server/files/patch-core-CMakeLists.txt
+++ b/sysutils/bareos20-server/files/patch-core-CMakeLists.txt
@@ -1,43 +1,41 @@
---- core/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
-+++ core/CMakeLists.txt	2020-12-26 21:28:44.141734000 -0500
+--- core/CMakeLists.txt	2022-11-09 05:57:28.000000000 -0500
++++ core/CMakeLists.txt	2022-11-18 00:05:47.668001000 -0500
 @@ -256,7 +256,9 @@
    set(PSCMD "ps -ax -o pid,command")
    include_directories(/usr/local/include)
    link_directories(/usr/local/lib)
 -  link_libraries(intl)
-+  IF(nls)
++  if(nls)
 +    link_libraries(intl)
-+  ENDIF()
- endif()
- 
- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-@@ -323,8 +325,11 @@
++  endif()
+   check_cxx_compiler_flag(
+     -Wunused-but-set-variable compiler_will_warn_of_unused_but_set_variable
+   )
+@@ -326,7 +328,9 @@
    add_definitions("-D_FILE_OFFSET_BITS=64")
  endif()
  
 -include(FindIntl)
++if(nls)
++  include(FindIntl)
++endif()
  
-+IF(nls)
-+  INCLUDE(FindIntl)
-+ENDIF()
-+
  if(developer)
    add_definitions("-DDEVELOPER=1")
- endif()
-@@ -347,7 +352,7 @@
+@@ -350,7 +354,7 @@
  if(NOT client-only)
    # droplet does not build on solaris because of sys/cdefs.h: No such file or
    # directory
 -  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
 +  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS|FreeBSD")
      if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/droplet/CMakeLists.txt)
        message(
          FATAL_ERROR
-@@ -771,7 +776,6 @@
+@@ -774,7 +778,6 @@
  
  add_subdirectory(scripts)
  add_subdirectory(manpages)
 -add_subdirectory(platforms)
  add_subdirectory(src)
  
  include(BareosLocalBuildDefinitions OPTIONAL
diff --git a/www/bareos20-webui/Makefile b/www/bareos20-webui/Makefile
index ee44f809a97b..ee88ab75406f 100644
--- a/www/bareos20-webui/Makefile
+++ b/www/bareos20-webui/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	20.0.7
+DISTVERSION=	20.0.8
 CATEGORIES?=	www sysutils
 PKGNAMESUFFIX=	20-webui
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	PHP-Frontend to manage Bareos over the web
 WWW=		https://www.bareos.org/
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/webui/LICENSE
 
 USE_GITHUB=	yes
 
 USES=		cpe php:build cmake gettext
 USE_PHP=	openssl gettext ctype hash json session iconv
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/webui
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}
 CMAKE_ARGS+=	-DSHARE_INSTALL_PREFIX:PATH=${PREFIX}/www \
 		-DCMAKE_INSTALL_FULL_SYSCONFDIR:PATH=${PREFIX}/etc \
 		-Dsysconfdir=${PREFIX}/etc \
 		-Dwebuiconfdir=${PREFIX}/${ETCDIRWEBUI}
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	ETCDIRWEBUI=${PREFIX}/${ETCDIRWEBUI}
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} ETCDIRWEBUI=${ETCDIRWEBUI}
 
 OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	PGSQL
 
 MYSQL_USE=		PHP=pdo_mysql
 PGSQL_USE=		PHP=pdo_pgsql
 
 ETCDIRWEBUI=		etc/${PORTNAME}${PKGNAMESUFFIX}
 
 post-extract:
 	${FIND} ${WRKSRC}/webui -name .gitignore -delete
 
 pre-install:
 	${FIND} ${WRKSRC}/webui -name *.in -delete
 
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}"
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
 	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
 	cd ${WRKSRC}/webui && ${COPYTREE_SHARE} "config data module public vendor" \
 		${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/composer* ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/phpunit.xml ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/directors.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/configuration.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-limited.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-limited.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-readonly.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-readonly.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/apache-bareos-webui.conf
 	${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/nginx-bareos-webui.conf
 
 .include <bsd.port.mk>
diff --git a/www/bareos20-webui/distinfo b/www/bareos20-webui/distinfo
index b08a43c15124..7c9ec4b65356 100644
--- a/www/bareos20-webui/distinfo
+++ b/www/bareos20-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667253033
-SHA256 (bareos-bareos-Release-20.0.7_GH0.tar.gz) = b92e46750883e53ef763d426626cc0dea5ea80442dae647a983f348c8b9aeb38
-SIZE (bareos-bareos-Release-20.0.7_GH0.tar.gz) = 13429660
+TIMESTAMP = 1668748829
+SHA256 (bareos-bareos-Release-20.0.8_GH0.tar.gz) = b8408d6a1a966fa97d02d727b1f92bb7ed40c7a34d5b66f118f1a09b1a8edaa3
+SIZE (bareos-bareos-Release-20.0.8_GH0.tar.gz) = 13429247