3 files changed, 94 insertions, 148 deletions

diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index e3299fe9d4b1..2a5b38677b55 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	filezilla
-PORTVERSION=	3.0.10
-PORTREVISION=	1
+PORTVERSION=	3.0.11
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 DISTNAME=	FileZilla_${PORTVERSION}_src
diff --git a/ftp/filezilla/distinfo b/ftp/filezilla/distinfo
index 4c2adefbaad0..9cb18df43de0 100644
--- a/ftp/filezilla/distinfo
+++ b/ftp/filezilla/distinfo
@@ -1,3 +1,3 @@
-MD5 (FileZilla_3.0.10_src.tar.bz2) = d453cef44a89e3448fc6790669a811f6
-SHA256 (FileZilla_3.0.10_src.tar.bz2) = ed69b02de19d48954542b0b5d88263f141a50e580c0a00ec6fc469fc6b3a07c7
-SIZE (FileZilla_3.0.10_src.tar.bz2) = 2130261
+MD5 (FileZilla_3.0.11_src.tar.bz2) = 776e6eec6ee19b33b35fb55269da1e85
+SHA256 (FileZilla_3.0.11_src.tar.bz2) = f2fcb37da4c54a28059724b933b14cf03fd783e74c912c0725776c5f0de1924c
+SIZE (FileZilla_3.0.11_src.tar.bz2) = 2172359
diff --git a/ftp/filezilla/pkg-plist b/ftp/filezilla/pkg-plist
index 1ed06c7ed1bb..6ad0fbd0306e 100644
--- a/ftp/filezilla/pkg-plist
+++ b/ftp/filezilla/pkg-plist
@@ -1,7 +1,51 @@
 bin/filezilla
-bin/fzputtygen
 bin/fzsftp
-share/applications/filezilla.desktop
+bin/fzputtygen
+share/locale/ar/LC_MESSAGES/filezilla.mo
+share/locale/ca/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/fr/LC_MESSAGES/filezilla.mo
+share/locale/it/LC_MESSAGES/filezilla.mo
+share/locale/ka/LC_MESSAGES/filezilla.mo
+share/locale/ne/LC_MESSAGES/filezilla.mo
+share/locale/nl/LC_MESSAGES/filezilla.mo
+share/locale/pt_BR/LC_MESSAGES/filezilla.mo
+share/locale/pt_PT/LC_MESSAGES/filezilla.mo
+share/locale/ru/LC_MESSAGES/filezilla.mo
+share/locale/sv/LC_MESSAGES/filezilla.mo
+share/locale/tr/LC_MESSAGES/filezilla.mo
+share/locale/zh_CN/LC_MESSAGES/filezilla.mo
+share/locale/zh_TW/LC_MESSAGES/filezilla.mo
+share/locale/bg_BG/LC_MESSAGES/filezilla.mo
+share/locale/ca_ES@valencia/LC_MESSAGES/filezilla.mo
+share/locale/cs_CZ/LC_MESSAGES/filezilla.mo
+share/locale/da_DK/LC_MESSAGES/filezilla.mo
+share/locale/et_EE/LC_MESSAGES/filezilla.mo
+share/locale/eu_ES/LC_MESSAGES/filezilla.mo
+share/locale/fi_FI/LC_MESSAGES/filezilla.mo
+share/locale/fr_CA/LC_MESSAGES/filezilla.mo
+share/locale/gl_ES/LC_MESSAGES/filezilla.mo
+share/locale/he_IL/LC_MESSAGES/filezilla.mo
+share/locale/hu_HU/LC_MESSAGES/filezilla.mo
+share/locale/id_ID/LC_MESSAGES/filezilla.mo
+share/locale/ja_JP/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/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/pl_PL/LC_MESSAGES/filezilla.mo
+share/locale/ro_RO/LC_MESSAGES/filezilla.mo
+share/locale/sk_SK/LC_MESSAGES/filezilla.mo
+share/locale/sl_SI/LC_MESSAGES/filezilla.mo
+share/locale/th_TH/LC_MESSAGES/filezilla.mo
+share/locale/uk_UA/LC_MESSAGES/filezilla.mo
+share/locale/vi_VN/LC_MESSAGES/filezilla.mo
+share/pixmaps/filezilla.png
 %%DATADIR%%/docs/fzdefaults.xml.example
 %%DATADIR%%/resources/16x16/ascii.png
 %%DATADIR%%/resources/16x16/auto.png
@@ -31,7 +75,36 @@ share/applications/filezilla.desktop
 %%DATADIR%%/resources/16x16/uploadadd.png
 %%DATADIR%%/resources/32x32/file.png
 %%DATADIR%%/resources/32x32/filezilla.png
-%%DATADIR%%/resources/48x48/filezilla.png
+%%DATADIR%%/resources/cyril/16x16/ascii.png
+%%DATADIR%%/resources/cyril/16x16/auto.png
+%%DATADIR%%/resources/cyril/16x16/binary.png
+%%DATADIR%%/resources/cyril/16x16/bookmark.png
+%%DATADIR%%/resources/cyril/16x16/cancel.png
+%%DATADIR%%/resources/cyril/16x16/compare.png
+%%DATADIR%%/resources/cyril/16x16/disconnect.png
+%%DATADIR%%/resources/cyril/16x16/download.png
+%%DATADIR%%/resources/cyril/16x16/downloadadd.png
+%%DATADIR%%/resources/cyril/16x16/file.png
+%%DATADIR%%/resources/cyril/16x16/folder.png
+%%DATADIR%%/resources/cyril/16x16/folderback.png
+%%DATADIR%%/resources/cyril/16x16/folderclosed.png
+%%DATADIR%%/resources/cyril/16x16/folderup.png
+%%DATADIR%%/resources/cyril/16x16/help.png
+%%DATADIR%%/resources/cyril/16x16/localtreeview.png
+%%DATADIR%%/resources/cyril/16x16/logview.png
+%%DATADIR%%/resources/cyril/16x16/processqueue.png
+%%DATADIR%%/resources/cyril/16x16/queueview.png
+%%DATADIR%%/resources/cyril/16x16/reconnect.png
+%%DATADIR%%/resources/cyril/16x16/refresh.png
+%%DATADIR%%/resources/cyril/16x16/remotetreeview.png
+%%DATADIR%%/resources/cyril/16x16/server.png
+%%DATADIR%%/resources/cyril/16x16/showhidden.png
+%%DATADIR%%/resources/cyril/16x16/sitemanager.png
+%%DATADIR%%/resources/cyril/16x16/speedlimits.png
+%%DATADIR%%/resources/cyril/16x16/synchronize.png
+%%DATADIR%%/resources/cyril/16x16/upload.png
+%%DATADIR%%/resources/cyril/16x16/uploadadd.png
+%%DATADIR%%/resources/cyril/theme.xml
 %%DATADIR%%/resources/blukis/16x16/ascii.png
 %%DATADIR%%/resources/blukis/16x16/auto.png
 %%DATADIR%%/resources/blukis/16x16/binary.png
@@ -124,41 +197,11 @@ share/applications/filezilla.desktop
 %%DATADIR%%/resources/blukis/48x48/upload.png
 %%DATADIR%%/resources/blukis/48x48/uploadadd.png
 %%DATADIR%%/resources/blukis/theme.xml
-%%DATADIR%%/resources/cyril/16x16/ascii.png
-%%DATADIR%%/resources/cyril/16x16/auto.png
-%%DATADIR%%/resources/cyril/16x16/binary.png
-%%DATADIR%%/resources/cyril/16x16/bookmark.png
-%%DATADIR%%/resources/cyril/16x16/cancel.png
-%%DATADIR%%/resources/cyril/16x16/compare.png
-%%DATADIR%%/resources/cyril/16x16/disconnect.png
-%%DATADIR%%/resources/cyril/16x16/download.png
-%%DATADIR%%/resources/cyril/16x16/downloadadd.png
-%%DATADIR%%/resources/cyril/16x16/file.png
-%%DATADIR%%/resources/cyril/16x16/folder.png
-%%DATADIR%%/resources/cyril/16x16/folderback.png
-%%DATADIR%%/resources/cyril/16x16/folderclosed.png
-%%DATADIR%%/resources/cyril/16x16/folderup.png
-%%DATADIR%%/resources/cyril/16x16/help.png
-%%DATADIR%%/resources/cyril/16x16/localtreeview.png
-%%DATADIR%%/resources/cyril/16x16/logview.png
-%%DATADIR%%/resources/cyril/16x16/processqueue.png
-%%DATADIR%%/resources/cyril/16x16/queueview.png
-%%DATADIR%%/resources/cyril/16x16/reconnect.png
-%%DATADIR%%/resources/cyril/16x16/refresh.png
-%%DATADIR%%/resources/cyril/16x16/remotetreeview.png
-%%DATADIR%%/resources/cyril/16x16/server.png
-%%DATADIR%%/resources/cyril/16x16/showhidden.png
-%%DATADIR%%/resources/cyril/16x16/sitemanager.png
-%%DATADIR%%/resources/cyril/16x16/speedlimits.png
-%%DATADIR%%/resources/cyril/16x16/synchronize.png
-%%DATADIR%%/resources/cyril/16x16/upload.png
-%%DATADIR%%/resources/cyril/16x16/uploadadd.png
-%%DATADIR%%/resources/cyril/theme.xml
+%%DATADIR%%/resources/48x48/filezilla.png
 %%DATADIR%%/resources/defaultfilters.xml
 %%DATADIR%%/resources/dialogs.xrc
 %%DATADIR%%/resources/down.png
 %%DATADIR%%/resources/dropdown.png
-%%DATADIR%%/resources/empty.png
 %%DATADIR%%/resources/finished.wav
 %%DATADIR%%/resources/leds.png
 %%DATADIR%%/resources/menus.xrc
@@ -167,158 +210,62 @@ share/applications/filezilla.desktop
 %%DATADIR%%/resources/theme.xml
 %%DATADIR%%/resources/toolbar.xrc
 %%DATADIR%%/resources/up.png
-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/cs_CZ/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_EE/LC_MESSAGES/filezilla.mo
-share/locale/eu_ES/LC_MESSAGES/filezilla.mo
-share/locale/fi_FI/LC_MESSAGES/filezilla.mo
-share/locale/fr/LC_MESSAGES/filezilla.mo
-share/locale/fr_CA/LC_MESSAGES/filezilla.mo
-share/locale/gl_ES/LC_MESSAGES/filezilla.mo
-share/locale/he_IL/LC_MESSAGES/filezilla.mo
-share/locale/hu_HU/LC_MESSAGES/filezilla.mo
-share/locale/id_ID/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/km_KH/LC_MESSAGES/filezilla.mo
-share/locale/ko_KR/LC_MESSAGES/filezilla.mo
-share/locale/ku/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/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/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
-@dirrm %%DATADIR%%/resources/cyril/16x16
-@dirrm %%DATADIR%%/resources/cyril
-@dirrm %%DATADIR%%/resources/blukis/48x48
-@dirrm %%DATADIR%%/resources/blukis/32x32
-@dirrm %%DATADIR%%/resources/blukis/16x16
-@dirrm %%DATADIR%%/resources/blukis
-@dirrm %%DATADIR%%/resources/48x48
-@dirrm %%DATADIR%%/resources/32x32
-@dirrm %%DATADIR%%/resources/16x16
-@dirrm %%DATADIR%%/resources
-@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
+share/applications/filezilla.desktop
 @dirrmtry share/locale/vi_VN/LC_MESSAGES
 @dirrmtry share/locale/vi_VN
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
 @dirrmtry share/locale/uk_UA/LC_MESSAGES
 @dirrmtry share/locale/uk_UA
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
 @dirrmtry share/locale/th_TH/LC_MESSAGES
 @dirrmtry share/locale/th_TH
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
 @dirrmtry share/locale/sl_SI/LC_MESSAGES
 @dirrmtry share/locale/sl_SI
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
 @dirrmtry share/locale/sk_SK/LC_MESSAGES
 @dirrmtry share/locale/sk_SK
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
 @dirrmtry share/locale/ro_RO/LC_MESSAGES
 @dirrmtry share/locale/ro_RO
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
 @dirrmtry share/locale/pl_PL/LC_MESSAGES
 @dirrmtry share/locale/pl_PL
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
 @dirrmtry share/locale/mk_MK/LC_MESSAGES
 @dirrmtry share/locale/mk_MK
 @dirrmtry share/locale/lv_LV/LC_MESSAGES
 @dirrmtry share/locale/lv_LV
 @dirrmtry share/locale/lt_LT/LC_MESSAGES
 @dirrmtry share/locale/lt_LT
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
 @dirrmtry share/locale/ko_KR/LC_MESSAGES
 @dirrmtry share/locale/ko_KR
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/km_KH/LC_MESSAGES
 @dirrmtry share/locale/km_KH
 @dirrmtry share/locale/ja_JP/LC_MESSAGES
 @dirrmtry share/locale/ja_JP
 @dirrmtry share/locale/id_ID/LC_MESSAGES
 @dirrmtry share/locale/id_ID
-@dirrmtry share/locale/hu_HU/LC_MESSAGES
-@dirrmtry share/locale/hu_HU
 @dirrmtry share/locale/he_IL/LC_MESSAGES
 @dirrmtry share/locale/he_IL
 @dirrmtry share/locale/gl_ES/LC_MESSAGES
 @dirrmtry share/locale/gl_ES
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
 @dirrmtry share/locale/fr_CA/LC_MESSAGES
 @dirrmtry share/locale/fr_CA
 @dirrmtry share/locale/fi_FI/LC_MESSAGES
 @dirrmtry share/locale/fi_FI
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/eu_ES/LC_MESSAGES
-@dirrmtry share/locale/eu_ES
 @dirrmtry share/locale/et_EE/LC_MESSAGES
 @dirrmtry share/locale/et_EE
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
 @dirrmtry share/locale/da_DK/LC_MESSAGES
 @dirrmtry share/locale/da_DK
 @dirrmtry share/locale/cs_CZ/LC_MESSAGES
 @dirrmtry share/locale/cs_CZ
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
 @dirrmtry share/locale/ca_ES@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca_ES@valencia
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
 @dirrmtry share/locale/bg_BG/LC_MESSAGES
 @dirrmtry share/locale/bg_BG
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
-@dirrmtry share/locale/bg_BG
-@dirrmtry share/applications
+@dirrm %%DATADIR%%/resources/cyril/16x16
+@dirrm %%DATADIR%%/resources/cyril
+@dirrm %%DATADIR%%/resources/blukis/48x48
+@dirrm %%DATADIR%%/resources/blukis/32x32
+@dirrm %%DATADIR%%/resources/blukis/16x16
+@dirrm %%DATADIR%%/resources/blukis
+@dirrm %%DATADIR%%/resources/48x48
+@dirrm %%DATADIR%%/resources/32x32
+@dirrm %%DATADIR%%/resources/16x16
+@dirrm %%DATADIR%%/resources
+@dirrm %%DATADIR%%/docs
+@dirrm %%DATADIR%%