diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile
index db8146812e3c..c065ecaa4930 100644
--- a/archivers/urbackup-client/Makefile
+++ b/archivers/urbackup-client/Makefile
@@ -1,63 +1,62 @@
 PORTNAME=	urbackup-client
-DISTVERSION=	2.4.11.0
-PORTREVISION=	2
+DISTVERSION=	2.5.19.0
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION:R}/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Client component of the UrBackup backup system
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 USES=		autoreconf compiler:c++11-lang dos2unix gettext libtool \
 		localbase pkgconfig sqlite:3
 USE_RC_SUBR=	urbackup_client
 
 USERS=		urbackup
 GROUPS=		urbackup
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-clientupdate \
 		--without-embedded-sqlite3
 CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
 
 SUB_FILES=	pkg-message urbackupclient.conf.sample-daemon
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	yes
 
 GUI_DESC=		GTK2 Tray Icon
 GUI_USE=		WX=3.0+
 GUI_CONFIGURE_ON=	--with-wx-config=${WX_CONFIG}
 GUI_CONFIGURE_OFF=	--enable-headless
 
 CONFFILES=	mariadbdump.conf mariadbxtrabackup.conf postgresbase.conf \
 		postgresqldump.conf
 
 post-patch:
 	@${SED} -i "" -e "s:%%PREFIX%%:${PREFIX}:g" \
 		${WRKSRC}/urbackupclient/backup_scripts/postgresqldump
 
 post-stage:
 	${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \
 		${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample
 
 	${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf-newsyslog \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf
 
 	${INSTALL_MAN} ${WRKSRC}/docs/urbackupclientbackend.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 
 .for f in ${CONFFILES}
 	${MV} ${STAGEDIR}${PREFIX}/etc/urbackup/${f} ${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample
 .endfor
 
 	${RM} ${STAGEDIR}/var/urbackup/version.txt
 	${RM} ${STAGEDIR}${PREFIX}/share/urbackup/urbackup_ecdsa409k1.pub
 
 .include <bsd.port.mk>
diff --git a/archivers/urbackup-client/distinfo b/archivers/urbackup-client/distinfo
index 8f5e7104938f..a68e38cc7f37 100644
--- a/archivers/urbackup-client/distinfo
+++ b/archivers/urbackup-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608009884
-SHA256 (urbackup-client-2.4.11.0.tar.gz) = 819dffb2521bf78e43ca0e6b8222aa79478f7a04d27682c36e00665129766fbf
-SIZE (urbackup-client-2.4.11.0.tar.gz) = 4691460
+TIMESTAMP = 1661794976
+SHA256 (urbackup-client-2.5.19.0.tar.gz) = f2a12caa4b4b338f71586069c506663effb79abb07a21ea731c83b229c3aed05
+SIZE (urbackup-client-2.5.19.0.tar.gz) = 4978478
diff --git a/archivers/urbackup-client/files/patch-Makefile.am b/archivers/urbackup-client/files/patch-Makefile.am
index 7737c5758c79..3f26c5dfff5c 100644
--- a/archivers/urbackup-client/files/patch-Makefile.am
+++ b/archivers/urbackup-client/files/patch-Makefile.am
@@ -1,45 +1,49 @@
 Makefile.am uses ${INSTALL_PROGAM} to install scripts and configuation files,
 leading to an error from strip(1). This patch instead uses ${INSTALL} (for scripts)
 and ${INSTALL_DATA} (for configuration files).
 
---- Makefile.am.orig	2018-08-27 01:45:13 UTC
+--- Makefile.am.orig	2022-08-29 17:51:29 UTC
 +++ Makefile.am
-@@ -119,22 +119,22 @@ endif
+@@ -198,24 +198,24 @@ endif
  	$(MKDIR_P) "$(DESTDIR)$(datadir)/urbackup/scripts"
  	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)/urbackup"
  	
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/list_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/list_incr"
 -	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump"
 -	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump"
 -	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup"
 -	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup"
+-	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup_incr"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup"
 -	$(INSTALL_PROGRAM) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/list" "$(DESTDIR)$(datadir)/urbackup/scripts/list"
-+	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/list_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/list_incr"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbdump.conf"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbdump" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbdump"
-+	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresqldump.conf"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqldump" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqldump"
-+	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresbase.conf" "$(DESTDIR)$(sysconfdir)/urbackup/postgresbase.conf"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresbase" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresbase"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlprebackup"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/postgresqlpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/postgresqlpostbackup"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-postgresbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-postgresbackup"
-+	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL_DATA) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
++	test -e "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf" || $(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup.conf" "$(DESTDIR)$(sysconfdir)/urbackup/mariadbxtrabackup.conf"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup"
++	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbxtrabackup_incr" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbxtrabackup_incr"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/restore-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/restore-mariadbbackup"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbprebackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbprebackup"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/mariadbpostbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/mariadbpostbackup"
 +	$(INSTALL) "$(srcdir)/urbackupclient/backup_scripts/setup-mariadbbackup" "$(DESTDIR)$(datadir)/urbackup/scripts/setup-mariadbbackup"
  	
  	for script in "$(DESTDIR)$(datadir)/urbackup/scripts/"*; do sed "s|SYSCONFDIR|$(sysconfdir)/urbackup|g" "$$script" > "$$script.r"; mv "$$script.r" "$$script"; done
  	chmod 700 "$(DESTDIR)$(datadir)/urbackup/scripts/"*
diff --git a/archivers/urbackup-client/files/patch-client_ConfigPath.cpp b/archivers/urbackup-client/files/patch-client_ConfigPath.cpp
index 93e7f9551e1c..da84f652039e 100644
--- a/archivers/urbackup-client/files/patch-client_ConfigPath.cpp
+++ b/archivers/urbackup-client/files/patch-client_ConfigPath.cpp
@@ -1,24 +1,15 @@
 Build fails on FreeBSD due to a casting error from the wxString Class when using
 wx30-gtk2-3.0.4_1. This patch adds a cast (static_cast<const wchar_t*>) that
 resolves the error.
 
---- client/ConfigPath.cpp.orig	2018-08-12 19:17:13 UTC
+--- client/ConfigPath.cpp.orig	2022-08-29 17:43:41 UTC
 +++ client/ConfigPath.cpp
-@@ -60,7 +60,7 @@ ConfigPath::ConfigPath(wxWindow* parent)
- 		listbox->Append(dirs[i].path);
- 		if(dirs[i].name.IsEmpty())
- 		{
--			dirs[i].name=getDefaultDirname(dirs[i].path.wc_str());
-+			dirs[i].name=getDefaultDirname(static_cast<const wchar_t*>(dirs[i].path.wc_str()));
- 		}
- 	}
- 
-@@ -93,7 +93,7 @@ void ConfigPath::OnClickNew(wxCommandEve
+@@ -208,7 +208,7 @@ void ConfigPath::OnClickNew(wxCommandEvent &evt)
  		listbox->Append(ed.GetPath() );
  		SBackupDir ad;
  		ad.path=ed.GetPath();
 -		ad.name=getDefaultDirname(ad.path.wc_str());
 +		ad.name=getDefaultDirname(static_cast<const wchar_t*>(ad.path.wc_str()));
  		ad.group=0;
  		ad.id=0;
- 		dirs.push_back(ad);
+ 		ad.server_default = 0;
diff --git a/archivers/urbackup-client/files/patch-client_stringtools.cpp b/archivers/urbackup-client/files/patch-client_stringtools.cpp
index 6a5cd19571b7..a6b0655d5455 100644
--- a/archivers/urbackup-client/files/patch-client_stringtools.cpp
+++ b/archivers/urbackup-client/files/patch-client_stringtools.cpp
@@ -1,68 +1,42 @@
 Build fails on FreeBSD due to urbackup's local definitions of isnumber()
 conflicting with a library function. This patch renames the port's definition to
 resolve the conflict. Analogous changes are also made in client/stringtools.h
 
---- client/stringtools.cpp.orig	2018-08-12 19:17:45 UTC
+--- client/stringtools.cpp.orig	2022-08-29 17:44:01 UTC
 +++ client/stringtools.cpp
-@@ -486,12 +486,12 @@ std::string nconvert(s32 i){
- 	ss << i;
- 	return ss.str();
- }
--
--std::string nconvert(int long i) {
--	ostringstream ss;
--	ss << i;
--	return ss.str();
--}
-+
-+std::string nconvert(int long i) {
-+	ostringstream ss;
-+	ss << i;
-+	return ss.str();
-+}
- 
- #if defined(_WIN64) || defined(_LP64)
- std::string nconvert(unsigned int i){
-@@ -825,7 +825,7 @@ void TokenizeMail(std::string& str, std:
+@@ -826,7 +826,7 @@ void TokenizeMail(const std::string& str, std::vector<
  //--------------------------------------------------------------------
  /**
  */
 -bool isnumber(char ch)
 +bool isnumber_local(char ch)
  {
  	if( ch>=48 && ch <=57 )
  		return true;
-@@ -848,7 +848,7 @@ bool isletter(char ch)
+@@ -849,7 +849,7 @@ bool isletter(char ch)
  //--------------------------------------------------------------------
  /**
  */
 -bool isnumber(wchar_t ch)
 +bool isnumber_local(wchar_t ch)
  {
  	if( ch>=48 && ch <=57 )
  		return true;
-@@ -928,7 +928,7 @@ int getNextNumber(const std::string &pSt
+@@ -929,7 +929,7 @@ int getNextNumber(const std::string &pStr, int *read)
  	bool start=false;
  	for(size_t i=0;i<pStr.size();++i)
  	{
 -		if( isnumber(pStr[i] ) )
 +		if( isnumber_local(pStr[i] ) )
  		{
  			num+=pStr[i];
  			start=true;
-@@ -1445,7 +1445,7 @@ void replaceNonAlphaNumeric(std::string 
+@@ -1444,7 +1444,7 @@ void replaceNonAlphaNumeric(std::string &str, char rch
  {
  	for(size_t i=0;i<str.size();++i)
  	{
 -		if(isletter(str[i])==false && isnumber(str[i])==false)
 +		if(isletter(str[i])==false && isnumber_local(str[i])==false)
  		{
  			str[i]=rch;
  		}
-@@ -1497,4 +1497,4 @@ std::string EscapeParamString(const std:
- 		}
- 	}
- 	return ret;
--}
-\ No newline at end of file
-+}
diff --git a/archivers/urbackup-client/files/patch-client_stringtools.h b/archivers/urbackup-client/files/patch-client_stringtools.h
deleted file mode 100644
index 7fecba55dc64..000000000000
--- a/archivers/urbackup-client/files/patch-client_stringtools.h
+++ /dev/null
@@ -1,18 +0,0 @@
-Build fails on FreeBSD due to urbackup's local definitions of isnumber()
-conflicting with a library function. This patch renames the port's definition to
-resolve the conflict. Analogous changes are also made in client/stringtools.cpp
-
---- client/stringtools.h.orig	2018-08-12 19:18:09 UTC
-+++ client/stringtools.h
-@@ -69,9 +69,9 @@ std::wstring replaceonce(std::wstring to
- void Tokenize(std::string& str, std::vector<std::string> &tokens, std::string seps);
- void Tokenize(std::wstring& str, std::vector<std::wstring> &tokens, std::wstring seps);
- void TokenizeMail(std::string& str, std::vector<std::string> &tokens, std::string seps);
--bool isnumber(char ch);
-+bool isnumber_local(char ch);
- bool isletter(char ch);
--bool isnumber(wchar_t ch);
-+bool isnumber_local(wchar_t ch);
- bool isletter(wchar_t ch);
- void strupper(std::string *pStr);
- void strupper(std::wstring *pStr);
diff --git a/archivers/urbackup-client/pkg-plist b/archivers/urbackup-client/pkg-plist
index f51aaacbd609..dd3fc9242e0f 100644
--- a/archivers/urbackup-client/pkg-plist
+++ b/archivers/urbackup-client/pkg-plist
@@ -1,54 +1,56 @@
 bin/blockalign
 bin/urbackupclientctl
 %%GUI%%bin/urbackupclientgui
 sbin/urbackupclientbackend
 @(,,0444) man/man1/urbackupclientbackend.1.gz
 @mode 0600
 @sample etc/urbackup/mariadbdump.conf.sample
 @sample etc/urbackup/mariadbxtrabackup.conf.sample
 @sample etc/urbackup/postgresbase.conf.sample
 @sample etc/urbackup/postgresqldump.conf.sample
 @mode 0700
 share/urbackup/scripts/list
+share/urbackup/scripts/list_incr
 share/urbackup/scripts/mariadbdump
 share/urbackup/scripts/mariadbpostbackup
 share/urbackup/scripts/mariadbprebackup
 share/urbackup/scripts/mariadbxtrabackup
+share/urbackup/scripts/mariadbxtrabackup_incr
 share/urbackup/scripts/postgresbase
 share/urbackup/scripts/postgresqldump
 share/urbackup/scripts/postgresqlpostbackup
 share/urbackup/scripts/postgresqlprebackup
 share/urbackup/scripts/restore-mariadbbackup
 share/urbackup/scripts/setup-mariadbbackup
 share/urbackup/scripts/setup-postgresbackup
 @mode 0644
 @sample etc/urbackup/urbackupclient.conf.sample
 etc/newsyslog.conf.d/urbackupclient.conf
 share/urbackup/updates_h.dat
 %%GUI%%share/urbackup/backup-bad.xpm
 %%GUI%%share/urbackup/backup-indexing.xpm
 %%GUI%%share/urbackup/backup-no-recent.xpm
 %%GUI%%share/urbackup/backup-no-server.xpm
 %%GUI%%share/urbackup/backup-ok.xpm
 %%GUI%%share/urbackup/backup-progress-pause.xpm
 %%GUI%%share/urbackup/backup-progress.xpm
 %%GUI%%share/urbackup/info.txt
 %%GUI%%share/urbackup/lang/cs/urbackup.mo
 %%GUI%%share/urbackup/lang/da/urbackup.mo
 %%GUI%%share/urbackup/lang/de/urbackup.mo
 %%GUI%%share/urbackup/lang/es/urbackup.mo
 %%GUI%%share/urbackup/lang/fa/urbackup.mo
 %%GUI%%share/urbackup/lang/fr/urbackup.mo
 %%GUI%%share/urbackup/lang/it/urbackup.mo
 %%GUI%%share/urbackup/lang/nl/urbackup.mo
 %%GUI%%share/urbackup/lang/pl/urbackup.mo
 %%GUI%%share/urbackup/lang/pt_BR/urbackup.mo
 %%GUI%%share/urbackup/lang/ru/urbackup.mo
 %%GUI%%share/urbackup/lang/sk/urbackup.mo
 %%GUI%%share/urbackup/lang/uk/urbackup.mo
 %%GUI%%share/urbackup/lang/zh_CN/urbackup.mo
 %%GUI%%share/urbackup/lang/zh_TW/urbackup.mo
 %%GUI%%share/urbackup/logo1.png
 @dir(,,0700) /var/urbackup/data
 @dir(urbackup,urbackup,0755) /var/urbackup
 @mode 555