5 files changed, 200 insertions, 60 deletions

diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index d5793b77f171..75e3e485137e 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	filezilla
-PORTVERSION=	3.9.0.6
-PORTREVISION=	1
+PORTVERSION=	3.10.0
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
 DISTNAME=	FileZilla_${PORTVERSION}_src
diff --git a/ftp/filezilla/distinfo b/ftp/filezilla/distinfo
index adf2fde43fd4..956b221aa191 100644
--- a/ftp/filezilla/distinfo
+++ b/ftp/filezilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FileZilla_3.9.0.6_src.tar.bz2) = ce7f56b383fa59dc55b16d8695e9f03b6e86d59a04dce44a16b5d02b2391b0b7
-SIZE (FileZilla_3.9.0.6_src.tar.bz2) = 4181121
+SHA256 (FileZilla_3.10.0_src.tar.bz2) = 3bc4b018992b944db11c6673a305e3ccb85f215252f971473381a6693494c686
+SIZE (FileZilla_3.10.0_src.tar.bz2) = 4558534
diff --git a/ftp/filezilla/files/patch-engine__file.cpp b/ftp/filezilla/files/patch-engine__file.cpp
new file mode 100644
index 000000000000..cd830d17d071
--- /dev/null
+++ b/ftp/filezilla/files/patch-engine__file.cpp
@@ -0,0 +1,9 @@
+--- src/engine/file.cpp.orig	2015-01-08 13:40:54.000000000 +0100
++++ src/engine/file.cpp		2015-01-08 13:41:36.000000000 +0100
+@@ -1,5 +1,5 @@
+ #include <filezilla.h>
+-
++#include <errno.h>
+ #include "file.h"
+ 
+ CFile::CFile()
diff --git a/ftp/filezilla/files/patch-engine__process.cpp b/ftp/filezilla/files/patch-engine__process.cpp
new file mode 100644
index 000000000000..d7528de4acc1
--- /dev/null
+++ b/ftp/filezilla/files/patch-engine__process.cpp
@@ -0,0 +1,9 @@
+--- src/engine/process.cpp.orig	2015-01-08 13:44:22.000000000 +0100
++++ src/engine/process.cpp	2015-01-08 13:44:48.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <filezilla.h>
+ #include "process.h"
++#include <errno.h>
+ 
+ #ifdef __WXMSW__
+ 
diff --git a/ftp/filezilla/pkg-plist b/ftp/filezilla/pkg-plist
index 0cb1cd2ded5c..8498a390f7d9 100644
--- a/ftp/filezilla/pkg-plist
+++ b/ftp/filezilla/pkg-plist
@@ -5,6 +5,7 @@ man/man1/filezilla.1.gz
 man/man1/fzputtygen.1.gz
 man/man1/fzsftp.1.gz
 man/man5/fzdefaults.xml.5.gz
+share/appdata/filezilla.appdata.xml
 share/applications/filezilla.desktop
 %%DATADIR%%/docs/fzdefaults.xml.example
 %%DATADIR%%/resources/16x16/ascii.png
@@ -175,6 +176,127 @@ share/applications/filezilla.desktop
 %%DATADIR%%/resources/down.png
 %%DATADIR%%/resources/dropdown.png
 %%DATADIR%%/resources/finished.wav
+%%DATADIR%%/resources/flatzilla/16x16/ascii.png
+%%DATADIR%%/resources/flatzilla/16x16/auto.png
+%%DATADIR%%/resources/flatzilla/16x16/binary.png
+%%DATADIR%%/resources/flatzilla/16x16/bookmark.png
+%%DATADIR%%/resources/flatzilla/16x16/cancel.png
+%%DATADIR%%/resources/flatzilla/16x16/compare.png
+%%DATADIR%%/resources/flatzilla/16x16/disconnect.png
+%%DATADIR%%/resources/flatzilla/16x16/download.png
+%%DATADIR%%/resources/flatzilla/16x16/downloadadd.png
+%%DATADIR%%/resources/flatzilla/16x16/file.png
+%%DATADIR%%/resources/flatzilla/16x16/filter.png
+%%DATADIR%%/resources/flatzilla/16x16/find.png
+%%DATADIR%%/resources/flatzilla/16x16/folder.png
+%%DATADIR%%/resources/flatzilla/16x16/folderclosed.png
+%%DATADIR%%/resources/flatzilla/16x16/help.png
+%%DATADIR%%/resources/flatzilla/16x16/leds.png
+%%DATADIR%%/resources/flatzilla/16x16/localtreeview.png
+%%DATADIR%%/resources/flatzilla/16x16/lock.png
+%%DATADIR%%/resources/flatzilla/16x16/logview.png
+%%DATADIR%%/resources/flatzilla/16x16/processqueue.png
+%%DATADIR%%/resources/flatzilla/16x16/queueview.png
+%%DATADIR%%/resources/flatzilla/16x16/reconnect.png
+%%DATADIR%%/resources/flatzilla/16x16/refresh.png
+%%DATADIR%%/resources/flatzilla/16x16/remotetreeview.png
+%%DATADIR%%/resources/flatzilla/16x16/server.png
+%%DATADIR%%/resources/flatzilla/16x16/sitemanager.png
+%%DATADIR%%/resources/flatzilla/16x16/speedlimits.png
+%%DATADIR%%/resources/flatzilla/16x16/synchronize.png
+%%DATADIR%%/resources/flatzilla/16x16/upload.png
+%%DATADIR%%/resources/flatzilla/16x16/uploadadd.png
+%%DATADIR%%/resources/flatzilla/24x24/ascii.png
+%%DATADIR%%/resources/flatzilla/24x24/auto.png
+%%DATADIR%%/resources/flatzilla/24x24/binary.png
+%%DATADIR%%/resources/flatzilla/24x24/bookmark.png
+%%DATADIR%%/resources/flatzilla/24x24/cancel.png
+%%DATADIR%%/resources/flatzilla/24x24/compare.png
+%%DATADIR%%/resources/flatzilla/24x24/disconnect.png
+%%DATADIR%%/resources/flatzilla/24x24/download.png
+%%DATADIR%%/resources/flatzilla/24x24/downloadadd.png
+%%DATADIR%%/resources/flatzilla/24x24/file.png
+%%DATADIR%%/resources/flatzilla/24x24/filter.png
+%%DATADIR%%/resources/flatzilla/24x24/find.png
+%%DATADIR%%/resources/flatzilla/24x24/folder.png
+%%DATADIR%%/resources/flatzilla/24x24/folderclosed.png
+%%DATADIR%%/resources/flatzilla/24x24/help.png
+%%DATADIR%%/resources/flatzilla/24x24/leds.png
+%%DATADIR%%/resources/flatzilla/24x24/localtreeview.png
+%%DATADIR%%/resources/flatzilla/24x24/lock.png
+%%DATADIR%%/resources/flatzilla/24x24/logview.png
+%%DATADIR%%/resources/flatzilla/24x24/processqueue.png
+%%DATADIR%%/resources/flatzilla/24x24/queueview.png
+%%DATADIR%%/resources/flatzilla/24x24/reconnect.png
+%%DATADIR%%/resources/flatzilla/24x24/refresh.png
+%%DATADIR%%/resources/flatzilla/24x24/remotetreeview.png
+%%DATADIR%%/resources/flatzilla/24x24/server.png
+%%DATADIR%%/resources/flatzilla/24x24/sitemanager.png
+%%DATADIR%%/resources/flatzilla/24x24/speedlimits.png
+%%DATADIR%%/resources/flatzilla/24x24/synchronize.png
+%%DATADIR%%/resources/flatzilla/24x24/upload.png
+%%DATADIR%%/resources/flatzilla/24x24/uploadadd.png
+%%DATADIR%%/resources/flatzilla/32x32/ascii.png
+%%DATADIR%%/resources/flatzilla/32x32/auto.png
+%%DATADIR%%/resources/flatzilla/32x32/binary.png
+%%DATADIR%%/resources/flatzilla/32x32/bookmark.png
+%%DATADIR%%/resources/flatzilla/32x32/cancel.png
+%%DATADIR%%/resources/flatzilla/32x32/compare.png
+%%DATADIR%%/resources/flatzilla/32x32/disconnect.png
+%%DATADIR%%/resources/flatzilla/32x32/download.png
+%%DATADIR%%/resources/flatzilla/32x32/downloadadd.png
+%%DATADIR%%/resources/flatzilla/32x32/file.png
+%%DATADIR%%/resources/flatzilla/32x32/filter.png
+%%DATADIR%%/resources/flatzilla/32x32/find.png
+%%DATADIR%%/resources/flatzilla/32x32/folder.png
+%%DATADIR%%/resources/flatzilla/32x32/folderclosed.png
+%%DATADIR%%/resources/flatzilla/32x32/help.png
+%%DATADIR%%/resources/flatzilla/32x32/leds.png
+%%DATADIR%%/resources/flatzilla/32x32/localtreeview.png
+%%DATADIR%%/resources/flatzilla/32x32/lock.png
+%%DATADIR%%/resources/flatzilla/32x32/logview.png
+%%DATADIR%%/resources/flatzilla/32x32/processqueue.png
+%%DATADIR%%/resources/flatzilla/32x32/queueview.png
+%%DATADIR%%/resources/flatzilla/32x32/reconnect.png
+%%DATADIR%%/resources/flatzilla/32x32/refresh.png
+%%DATADIR%%/resources/flatzilla/32x32/remotetreeview.png
+%%DATADIR%%/resources/flatzilla/32x32/server.png
+%%DATADIR%%/resources/flatzilla/32x32/sitemanager.png
+%%DATADIR%%/resources/flatzilla/32x32/speedlimits.png
+%%DATADIR%%/resources/flatzilla/32x32/synchronize.png
+%%DATADIR%%/resources/flatzilla/32x32/upload.png
+%%DATADIR%%/resources/flatzilla/32x32/uploadadd.png
+%%DATADIR%%/resources/flatzilla/48x48/ascii.png
+%%DATADIR%%/resources/flatzilla/48x48/auto.png
+%%DATADIR%%/resources/flatzilla/48x48/binary.png
+%%DATADIR%%/resources/flatzilla/48x48/bookmark.png
+%%DATADIR%%/resources/flatzilla/48x48/cancel.png
+%%DATADIR%%/resources/flatzilla/48x48/compare.png
+%%DATADIR%%/resources/flatzilla/48x48/disconnect.png
+%%DATADIR%%/resources/flatzilla/48x48/download.png
+%%DATADIR%%/resources/flatzilla/48x48/downloadadd.png
+%%DATADIR%%/resources/flatzilla/48x48/file.png
+%%DATADIR%%/resources/flatzilla/48x48/filter.png
+%%DATADIR%%/resources/flatzilla/48x48/find.png
+%%DATADIR%%/resources/flatzilla/48x48/folder.png
+%%DATADIR%%/resources/flatzilla/48x48/folderclosed.png
+%%DATADIR%%/resources/flatzilla/48x48/help.png
+%%DATADIR%%/resources/flatzilla/48x48/leds.png
+%%DATADIR%%/resources/flatzilla/48x48/localtreeview.png
+%%DATADIR%%/resources/flatzilla/48x48/lock.png
+%%DATADIR%%/resources/flatzilla/48x48/logview.png
+%%DATADIR%%/resources/flatzilla/48x48/processqueue.png
+%%DATADIR%%/resources/flatzilla/48x48/queueview.png
+%%DATADIR%%/resources/flatzilla/48x48/reconnect.png
+%%DATADIR%%/resources/flatzilla/48x48/refresh.png
+%%DATADIR%%/resources/flatzilla/48x48/remotetreeview.png
+%%DATADIR%%/resources/flatzilla/48x48/server.png
+%%DATADIR%%/resources/flatzilla/48x48/sitemanager.png
+%%DATADIR%%/resources/flatzilla/48x48/speedlimits.png
+%%DATADIR%%/resources/flatzilla/48x48/synchronize.png
+%%DATADIR%%/resources/flatzilla/48x48/upload.png
+%%DATADIR%%/resources/flatzilla/48x48/uploadadd.png
+%%DATADIR%%/resources/flatzilla/theme.xml
 %%DATADIR%%/resources/leds.png
 %%DATADIR%%/resources/lone/16x16/ascii.png
 %%DATADIR%%/resources/lone/16x16/auto.png
@@ -532,60 +654,61 @@ share/icons/hicolor/16x16/apps/filezilla.png
 share/icons/hicolor/32x32/apps/filezilla.png
 share/icons/hicolor/48x48/apps/filezilla.png
 share/icons/hicolor/scalable/apps/filezilla.svg
-%%NLS%%share/locale/an/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/bg_BG/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ca_ES@valencia/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/co/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/cs_CZ/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/da_DK/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/de/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/el/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/es/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/et_EE/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/eu_ES/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/fa_IR/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/fi_FI/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/gl_ES/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/he_IL/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/hu_HU/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/hy/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/is/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/it/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ja_JP/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/kab/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/km_KH/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ko_KR/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ky/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/lo_LA/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/lt_LT/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/lv_LV/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/mk_MK/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/nb_NO/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ne/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/nn_NO/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/pl_PL/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ro_RO/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/sk_SK/LC_MESSAGES/filezilla.mo
-%%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/th_TH/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/uk_UA/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/vi_VN/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/filezilla.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/filezilla.mo
+share/locale/an/LC_MESSAGES/filezilla.mo
+share/locale/ar/LC_MESSAGES/filezilla.mo
+share/locale/bg_BG/LC_MESSAGES/filezilla.mo
+share/locale/ca/LC_MESSAGES/filezilla.mo
+share/locale/ca_ES@valencia/LC_MESSAGES/filezilla.mo
+share/locale/co/LC_MESSAGES/filezilla.mo
+share/locale/cs_CZ/LC_MESSAGES/filezilla.mo
+share/locale/cy/LC_MESSAGES/filezilla.mo
+share/locale/da_DK/LC_MESSAGES/filezilla.mo
+share/locale/de/LC_MESSAGES/filezilla.mo
+share/locale/el/LC_MESSAGES/filezilla.mo
+share/locale/es/LC_MESSAGES/filezilla.mo
+share/locale/et/LC_MESSAGES/filezilla.mo
+share/locale/eu/LC_MESSAGES/filezilla.mo
+share/locale/eu_ES/LC_MESSAGES/filezilla.mo
+share/locale/fa_IR/LC_MESSAGES/filezilla.mo
+share/locale/fi_FI/LC_MESSAGES/filezilla.mo
+share/locale/fr/LC_MESSAGES/filezilla.mo
+share/locale/gl_ES/LC_MESSAGES/filezilla.mo
+share/locale/he_IL/LC_MESSAGES/filezilla.mo
+share/locale/hr/LC_MESSAGES/filezilla.mo
+share/locale/hu_HU/LC_MESSAGES/filezilla.mo
+share/locale/hy/LC_MESSAGES/filezilla.mo
+share/locale/id_ID/LC_MESSAGES/filezilla.mo
+share/locale/is/LC_MESSAGES/filezilla.mo
+share/locale/it/LC_MESSAGES/filezilla.mo
+share/locale/ja_JP/LC_MESSAGES/filezilla.mo
+share/locale/ka/LC_MESSAGES/filezilla.mo
+share/locale/kab/LC_MESSAGES/filezilla.mo
+share/locale/km_KH/LC_MESSAGES/filezilla.mo
+share/locale/ko_KR/LC_MESSAGES/filezilla.mo
+share/locale/ku/LC_MESSAGES/filezilla.mo
+share/locale/ky/LC_MESSAGES/filezilla.mo
+share/locale/lo_LA/LC_MESSAGES/filezilla.mo
+share/locale/lt_LT/LC_MESSAGES/filezilla.mo
+share/locale/lv_LV/LC_MESSAGES/filezilla.mo
+share/locale/mk_MK/LC_MESSAGES/filezilla.mo
+share/locale/nb_NO/LC_MESSAGES/filezilla.mo
+share/locale/ne/LC_MESSAGES/filezilla.mo
+share/locale/nl/LC_MESSAGES/filezilla.mo
+share/locale/nn_NO/LC_MESSAGES/filezilla.mo
+share/locale/oc/LC_MESSAGES/filezilla.mo
+share/locale/pl_PL/LC_MESSAGES/filezilla.mo
+share/locale/pt_BR/LC_MESSAGES/filezilla.mo
+share/locale/pt_PT/LC_MESSAGES/filezilla.mo
+share/locale/ro_RO/LC_MESSAGES/filezilla.mo
+share/locale/ru/LC_MESSAGES/filezilla.mo
+share/locale/sk_SK/LC_MESSAGES/filezilla.mo
+share/locale/sl_SI/LC_MESSAGES/filezilla.mo
+share/locale/sr/LC_MESSAGES/filezilla.mo
+share/locale/sv/LC_MESSAGES/filezilla.mo
+share/locale/th_TH/LC_MESSAGES/filezilla.mo
+share/locale/tr/LC_MESSAGES/filezilla.mo
+share/locale/uk_UA/LC_MESSAGES/filezilla.mo
+share/locale/vi_VN/LC_MESSAGES/filezilla.mo
+share/locale/zh_CN/LC_MESSAGES/filezilla.mo
+share/locale/zh_TW/LC_MESSAGES/filezilla.mo
 share/pixmaps/filezilla.png