ftp/filezilla: Update to 3.55.1

Also update ftp/libfilezilla to the required version, filezilla is the
only consumer in the ports tree.

Changes:	https://filezilla-project.org/versions.php
PR:		258505
Approved by:	pi

6 files changed, 104 insertions, 33 deletions

diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 4f4ae86e2ac8..78ac73358878 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	filezilla
-PORTVERSION=	3.40.0
-PORTREVISION=	5
+PORTVERSION=	3.55.1
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/client/
 DISTNAME=	FileZilla_${PORTVERSION}_src
@@ -13,27 +12,29 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libfilezilla.so:ftp/libfilezilla \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
 		libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
 		libidn.so:dns/libidn \
 		libnettle.so:security/nettle \
-		libpugixml.so:textproc/pugixml \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
+		libpugixml.so:textproc/pugixml
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-INSTALLS_ICONS=	yes
-USES=		compiler:c++14-lang gmake gnome iconv:wchar_t localbase \
+USES=		compiler:c++17-lang gmake gnome iconv:wchar_t libtool localbase \
 		pkgconfig sqlite tar:bzip2
-USE_GNOME=	cairo gtk20
-USE_WX=		3.0
-WX_CONF_ARGS=	relative
+USE_GNOME=	cairo gtk30
+INSTALLS_ICONS=	yes
+INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS_DEFINE=	DBUS NLS
-OPTIONS_DEFAULT=DBUS
-OPTIONS_SUB=	yes
+USE_WX=		3.0
+WX_CONF_ARGS=	relative
+
+OPTIONS_DEFINE=		DBUS NLS
+OPTIONS_DEFAULT=	DBUS
+OPTIONS_SUB=		yes
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
diff --git a/ftp/filezilla/distinfo b/ftp/filezilla/distinfo
index bd86ac4fce96..fbb1e692c995 100644
--- a/ftp/filezilla/distinfo
+++ b/ftp/filezilla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549316085
-SHA256 (FileZilla_3.40.0_src.tar.bz2) = c36ca08540f0be2227b8721195bb16a626c01608f09ed60a862a73e640206085
-SIZE (FileZilla_3.40.0_src.tar.bz2) = 4997647
+TIMESTAMP = 1631620135
+SHA256 (FileZilla_3.55.1_src.tar.bz2) = 67f8d0e11f53fd23207d3cbfc942d03f3e23ee439ee48a14a2143c9950f776a5
+SIZE (FileZilla_3.55.1_src.tar.bz2) = 4910935
diff --git a/ftp/filezilla/pkg-plist b/ftp/filezilla/pkg-plist
index 0d57f2c3b2ed..1dce7d8640ad 100644
--- a/ftp/filezilla/pkg-plist
+++ b/ftp/filezilla/pkg-plist
@@ -1,6 +1,10 @@
 bin/filezilla
 bin/fzputtygen
 bin/fzsftp
+lib/libfzclient-commonui-private-3.55.1.so
+lib/libfzclient-commonui-private.so
+lib/libfzclient-private-3.55.1.so
+lib/libfzclient-private.so
 man/man1/filezilla.1.gz
 man/man1/fzputtygen.1.gz
 man/man1/fzsftp.1.gz
@@ -680,14 +684,8 @@ share/applications/filezilla.desktop
 %%DATADIR%%/resources/tango/48x48/upload.png
 %%DATADIR%%/resources/tango/48x48/uploadadd.png
 %%DATADIR%%/resources/tango/theme.xml
-%%DATADIR%%/resources/xrc/certificate.xrc
 %%DATADIR%%/resources/xrc/dialogs.xrc
-%%DATADIR%%/resources/xrc/inputdialog.xrc
 %%DATADIR%%/resources/xrc/netconfwizard.xrc
-%%DATADIR%%/resources/xrc/settings.xrc
-%%DATADIR%%/resources/xrc/sitemanager.xrc
-%%DATADIR%%/resources/xrc/storj.xrc
-%%DATADIR%%/resources/xrc/update.xrc
 share/icons/hicolor/16x16/apps/filezilla.png
 share/icons/hicolor/32x32/apps/filezilla.png
 share/icons/hicolor/480x480/apps/filezilla.png
@@ -744,6 +742,7 @@ share/icons/hicolor/scalable/apps/filezilla.svg
 %%NLS%%share/locale/sl_SI/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/filezilla.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/th_TH/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/uk_UA/LC_MESSAGES/filezilla.mo
diff --git a/ftp/libfilezilla/Makefile b/ftp/libfilezilla/Makefile
index d8a0d9af6b60..7737081a79fe 100644
--- a/ftp/libfilezilla/Makefile
+++ b/ftp/libfilezilla/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libfilezilla
-PORTVERSION=	0.15.1
-PORTREVISION=	3
+PORTVERSION=	0.31.1
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/${PORTNAME}/
 
@@ -10,10 +9,11 @@ COMMENT=	C++ library for building platform-independent programs
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnettle.so:security/nettle
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libnettle.so:security/nettle
 
-USES=		compiler:c++14-lang gmake iconv:wchar_t libtool localbase \
-		pathfix pkgconfig tar:bzip2
+USES=		compiler:c++17-lang gettext gmake iconv:wchar_t libtool \
+		localbase pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/ftp/libfilezilla/distinfo b/ftp/libfilezilla/distinfo
index 3c9edbf8071b..3fa7c275f8c8 100644
--- a/ftp/libfilezilla/distinfo
+++ b/ftp/libfilezilla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549315919
-SHA256 (libfilezilla-0.15.1.tar.bz2) = 2048c4128f3bf37a2a4ece17c8bea5455f3d7414fe2e060afcf2a8b00a87f49f
-SIZE (libfilezilla-0.15.1.tar.bz2) = 404746
+TIMESTAMP = 1631623924
+SHA256 (libfilezilla-0.31.1.tar.bz2) = 997d5887b6015f3869d375b0cbc4b4942fcb24dbe4b4346885c946cfe733166f
+SIZE (libfilezilla-0.31.1.tar.bz2) = 585070
diff --git a/ftp/libfilezilla/pkg-plist b/ftp/libfilezilla/pkg-plist
index fa722e9a038d..de1b9e0cde5d 100644
--- a/ftp/libfilezilla/pkg-plist
+++ b/ftp/libfilezilla/pkg-plist
@@ -7,29 +7,100 @@ include/libfilezilla/event_handler.hpp
 include/libfilezilla/event_loop.hpp
 include/libfilezilla/file.hpp
 include/libfilezilla/format.hpp
+include/libfilezilla/glue/unix.hpp
+include/libfilezilla/glue/windows.hpp
 include/libfilezilla/glue/wx.hpp
+include/libfilezilla/glue/wxinvoker.hpp
 include/libfilezilla/hash.hpp
+include/libfilezilla/hostname_lookup.hpp
+include/libfilezilla/invoker.hpp
 include/libfilezilla/iputils.hpp
+include/libfilezilla/json.hpp
+include/libfilezilla/jws.hpp
 include/libfilezilla/libfilezilla.hpp
 include/libfilezilla/local_filesys.hpp
+include/libfilezilla/logger.hpp
 include/libfilezilla/mutex.hpp
+include/libfilezilla/nonowning_buffer.hpp
 include/libfilezilla/optional.hpp
 include/libfilezilla/private/defs.hpp
 include/libfilezilla/private/visibility.hpp
-include/libfilezilla/private/windows.hpp
 include/libfilezilla/process.hpp
+include/libfilezilla/rate_limited_layer.hpp
+include/libfilezilla/rate_limiter.hpp
 include/libfilezilla/recursive_remove.hpp
+include/libfilezilla/rwmutex.hpp
 include/libfilezilla/shared.hpp
 include/libfilezilla/signature.hpp
+include/libfilezilla/socket.hpp
 include/libfilezilla/string.hpp
 include/libfilezilla/thread.hpp
 include/libfilezilla/thread_pool.hpp
 include/libfilezilla/time.hpp
+include/libfilezilla/tls_info.hpp
+include/libfilezilla/tls_layer.hpp
+include/libfilezilla/tls_system_trust_store.hpp
+include/libfilezilla/translate.hpp
 include/libfilezilla/uri.hpp
 include/libfilezilla/util.hpp
 include/libfilezilla/version.hpp
+include/libfilezilla/visibility_helper.hpp
 lib/libfilezilla.a
 lib/libfilezilla.so
-lib/libfilezilla.so.0
-lib/libfilezilla.so.0.0.0
+lib/libfilezilla.so.16
+lib/libfilezilla.so.16.1.0
 libdata/pkgconfig/libfilezilla.pc
+share/locale/an/LC_MESSAGES/libfilezilla.mo
+share/locale/ar/LC_MESSAGES/libfilezilla.mo
+share/locale/az/LC_MESSAGES/libfilezilla.mo
+share/locale/bg_BG/LC_MESSAGES/libfilezilla.mo
+share/locale/ca/LC_MESSAGES/libfilezilla.mo
+share/locale/ca_ES@valencia/LC_MESSAGES/libfilezilla.mo
+share/locale/co/LC_MESSAGES/libfilezilla.mo
+share/locale/cs_CZ/LC_MESSAGES/libfilezilla.mo
+share/locale/cy/LC_MESSAGES/libfilezilla.mo
+share/locale/da/LC_MESSAGES/libfilezilla.mo
+share/locale/de/LC_MESSAGES/libfilezilla.mo
+share/locale/el/LC_MESSAGES/libfilezilla.mo
+share/locale/es/LC_MESSAGES/libfilezilla.mo
+share/locale/et/LC_MESSAGES/libfilezilla.mo
+share/locale/eu/LC_MESSAGES/libfilezilla.mo
+share/locale/fa_IR/LC_MESSAGES/libfilezilla.mo
+share/locale/fi_FI/LC_MESSAGES/libfilezilla.mo
+share/locale/fr/LC_MESSAGES/libfilezilla.mo
+share/locale/gl_ES/LC_MESSAGES/libfilezilla.mo
+share/locale/he_IL/LC_MESSAGES/libfilezilla.mo
+share/locale/hr/LC_MESSAGES/libfilezilla.mo
+share/locale/hu_HU/LC_MESSAGES/libfilezilla.mo
+share/locale/hy/LC_MESSAGES/libfilezilla.mo
+share/locale/id_ID/LC_MESSAGES/libfilezilla.mo
+share/locale/is/LC_MESSAGES/libfilezilla.mo
+share/locale/it/LC_MESSAGES/libfilezilla.mo
+share/locale/ja_JP/LC_MESSAGES/libfilezilla.mo
+share/locale/kab/LC_MESSAGES/libfilezilla.mo
+share/locale/ko_KR/LC_MESSAGES/libfilezilla.mo
+share/locale/ky/LC_MESSAGES/libfilezilla.mo
+share/locale/lo_LA/LC_MESSAGES/libfilezilla.mo
+share/locale/lt_LT/LC_MESSAGES/libfilezilla.mo
+share/locale/lv_LV/LC_MESSAGES/libfilezilla.mo
+share/locale/mk_MK/LC_MESSAGES/libfilezilla.mo
+share/locale/nb_NO/LC_MESSAGES/libfilezilla.mo
+share/locale/ne/LC_MESSAGES/libfilezilla.mo
+share/locale/nl/LC_MESSAGES/libfilezilla.mo
+share/locale/nn_NO/LC_MESSAGES/libfilezilla.mo
+share/locale/oc/LC_MESSAGES/libfilezilla.mo
+share/locale/pl_PL/LC_MESSAGES/libfilezilla.mo
+share/locale/pt_BR/LC_MESSAGES/libfilezilla.mo
+share/locale/pt_PT/LC_MESSAGES/libfilezilla.mo
+share/locale/ro_RO/LC_MESSAGES/libfilezilla.mo
+share/locale/ru/LC_MESSAGES/libfilezilla.mo
+share/locale/sk_SK/LC_MESSAGES/libfilezilla.mo
+share/locale/sl_SI/LC_MESSAGES/libfilezilla.mo
+share/locale/sr/LC_MESSAGES/libfilezilla.mo
+share/locale/sv/LC_MESSAGES/libfilezilla.mo
+share/locale/th_TH/LC_MESSAGES/libfilezilla.mo
+share/locale/tr/LC_MESSAGES/libfilezilla.mo
+share/locale/uk_UA/LC_MESSAGES/libfilezilla.mo
+share/locale/vi_VN/LC_MESSAGES/libfilezilla.mo
+share/locale/zh_CN/LC_MESSAGES/libfilezilla.mo
+share/locale/zh_TW/LC_MESSAGES/libfilezilla.mo