summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/filezilla/Makefile9
-rw-r--r--net/filezilla/PLIST126
-rw-r--r--net/filezilla/distinfo11
-rw-r--r--net/filezilla/patches/patch-src_interface_queue.cpp31
4 files changed, 81 insertions, 96 deletions
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index 4c5f5130037..6e13e82827f 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.76 2016/12/12 14:22:03 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2017/01/01 15:49:13 wiz Exp $
-VERSION= 3.21.0
+VERSION= 3.23.0.2
DISTNAME= FileZilla_${VERSION}_src
PKGNAME= filezilla-${VERSION}
-PKGREVISION= 2
CATEGORIES= net x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=filezilla/}
+MASTER_SITES= https://download.filezilla-project.org/client/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -30,7 +29,7 @@ GCC_REQD+= 4.9
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libfilezilla+= libfilezilla>=0.6.1
+BUILDLINK_API_DEPENDS.libfilezilla+= libfilezilla>=0.9.0
.include "../../net/libfilezilla/buildlink3.mk"
BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.4.0
.include "../../security/gnutls/buildlink3.mk"
diff --git a/net/filezilla/PLIST b/net/filezilla/PLIST
index e5e72505b52..0196a050ff9 100644
--- a/net/filezilla/PLIST
+++ b/net/filezilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2016/04/29 12:03:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/01/01 15:49:13 wiz Exp $
bin/filezilla
bin/fzputtygen
bin/fzsftp
@@ -9,48 +9,18 @@ man/man5/fzdefaults.xml.5
share/appdata/filezilla.appdata.xml
share/applications/filezilla.desktop
share/filezilla/docs/fzdefaults.xml.example
-share/filezilla/resources/16x16/ascii.png
-share/filezilla/resources/16x16/auto.png
-share/filezilla/resources/16x16/binary.png
-share/filezilla/resources/16x16/bookmark.png
-share/filezilla/resources/16x16/cancel.png
-share/filezilla/resources/16x16/compare.png
-share/filezilla/resources/16x16/disconnect.png
-share/filezilla/resources/16x16/download.png
-share/filezilla/resources/16x16/downloadadd.png
-share/filezilla/resources/16x16/file.png
share/filezilla/resources/16x16/filezilla.png
-share/filezilla/resources/16x16/filter.png
-share/filezilla/resources/16x16/find.png
-share/filezilla/resources/16x16/folder.png
-share/filezilla/resources/16x16/folderclosed.png
-share/filezilla/resources/16x16/localtreeview.png
-share/filezilla/resources/16x16/lock.png
-share/filezilla/resources/16x16/logview.png
-share/filezilla/resources/16x16/processqueue.png
-share/filezilla/resources/16x16/queueview.png
-share/filezilla/resources/16x16/reconnect.png
-share/filezilla/resources/16x16/refresh.png
-share/filezilla/resources/16x16/remotetreeview.png
-share/filezilla/resources/16x16/server.png
-share/filezilla/resources/16x16/sitemanager.png
share/filezilla/resources/16x16/sort_down_dark.png
share/filezilla/resources/16x16/sort_down_light.png
share/filezilla/resources/16x16/sort_up_dark.png
share/filezilla/resources/16x16/sort_up_light.png
-share/filezilla/resources/16x16/speedlimits.png
-share/filezilla/resources/16x16/symlink.png
-share/filezilla/resources/16x16/synchronize.png
share/filezilla/resources/16x16/throbber.gif
share/filezilla/resources/16x16/unknown.png
-share/filezilla/resources/16x16/upload.png
-share/filezilla/resources/16x16/uploadadd.png
share/filezilla/resources/20x20/unknown.png
share/filezilla/resources/24x24/unknown.png
-share/filezilla/resources/32x32/file.png
share/filezilla/resources/32x32/filezilla.png
+share/filezilla/resources/480x480/filezilla.png
share/filezilla/resources/48x48/filezilla.png
-share/filezilla/resources/48x48/speedlimits.png
share/filezilla/resources/blukis/16x16/ascii.png
share/filezilla/resources/blukis/16x16/auto.png
share/filezilla/resources/blukis/16x16/binary.png
@@ -106,6 +76,7 @@ share/filezilla/resources/blukis/32x32/queueview.png
share/filezilla/resources/blukis/32x32/reconnect.png
share/filezilla/resources/blukis/32x32/refresh.png
share/filezilla/resources/blukis/32x32/remotetreeview.png
+share/filezilla/resources/blukis/32x32/server.png
share/filezilla/resources/blukis/32x32/showhidden.png
share/filezilla/resources/blukis/32x32/sitemanager.png
share/filezilla/resources/blukis/32x32/speedlimits.png
@@ -136,6 +107,7 @@ share/filezilla/resources/blukis/48x48/queueview.png
share/filezilla/resources/blukis/48x48/reconnect.png
share/filezilla/resources/blukis/48x48/refresh.png
share/filezilla/resources/blukis/48x48/remotetreeview.png
+share/filezilla/resources/blukis/48x48/server.png
share/filezilla/resources/blukis/48x48/showhidden.png
share/filezilla/resources/blukis/48x48/sitemanager.png
share/filezilla/resources/blukis/48x48/speedlimits.png
@@ -143,6 +115,36 @@ share/filezilla/resources/blukis/48x48/synchronize.png
share/filezilla/resources/blukis/48x48/upload.png
share/filezilla/resources/blukis/48x48/uploadadd.png
share/filezilla/resources/blukis/theme.xml
+share/filezilla/resources/classic/16x16/ascii.png
+share/filezilla/resources/classic/16x16/auto.png
+share/filezilla/resources/classic/16x16/binary.png
+share/filezilla/resources/classic/16x16/bookmark.png
+share/filezilla/resources/classic/16x16/cancel.png
+share/filezilla/resources/classic/16x16/compare.png
+share/filezilla/resources/classic/16x16/disconnect.png
+share/filezilla/resources/classic/16x16/download.png
+share/filezilla/resources/classic/16x16/downloadadd.png
+share/filezilla/resources/classic/16x16/file.png
+share/filezilla/resources/classic/16x16/filter.png
+share/filezilla/resources/classic/16x16/find.png
+share/filezilla/resources/classic/16x16/folder.png
+share/filezilla/resources/classic/16x16/folderclosed.png
+share/filezilla/resources/classic/16x16/localtreeview.png
+share/filezilla/resources/classic/16x16/lock.png
+share/filezilla/resources/classic/16x16/logview.png
+share/filezilla/resources/classic/16x16/processqueue.png
+share/filezilla/resources/classic/16x16/queueview.png
+share/filezilla/resources/classic/16x16/reconnect.png
+share/filezilla/resources/classic/16x16/refresh.png
+share/filezilla/resources/classic/16x16/remotetreeview.png
+share/filezilla/resources/classic/16x16/server.png
+share/filezilla/resources/classic/16x16/sitemanager.png
+share/filezilla/resources/classic/16x16/speedlimits.png
+share/filezilla/resources/classic/16x16/symlink.png
+share/filezilla/resources/classic/16x16/synchronize.png
+share/filezilla/resources/classic/16x16/upload.png
+share/filezilla/resources/classic/16x16/uploadadd.png
+share/filezilla/resources/classic/theme.xml
share/filezilla/resources/cyril/16x16/ascii.png
share/filezilla/resources/cyril/16x16/auto.png
share/filezilla/resources/cyril/16x16/binary.png
@@ -155,26 +157,44 @@ share/filezilla/resources/cyril/16x16/downloadadd.png
share/filezilla/resources/cyril/16x16/file.png
share/filezilla/resources/cyril/16x16/folder.png
share/filezilla/resources/cyril/16x16/folderback.png
-share/filezilla/resources/cyril/16x16/folderclosed.png
-share/filezilla/resources/cyril/16x16/folderup.png
-share/filezilla/resources/cyril/16x16/help.png
-share/filezilla/resources/cyril/16x16/localtreeview.png
-share/filezilla/resources/cyril/16x16/logview.png
-share/filezilla/resources/cyril/16x16/processqueue.png
-share/filezilla/resources/cyril/16x16/queueview.png
-share/filezilla/resources/cyril/16x16/reconnect.png
-share/filezilla/resources/cyril/16x16/refresh.png
-share/filezilla/resources/cyril/16x16/remotetreeview.png
-share/filezilla/resources/cyril/16x16/server.png
-share/filezilla/resources/cyril/16x16/showhidden.png
-share/filezilla/resources/cyril/16x16/sitemanager.png
-share/filezilla/resources/cyril/16x16/speedlimits.png
-share/filezilla/resources/cyril/16x16/synchronize.png
-share/filezilla/resources/cyril/16x16/upload.png
-share/filezilla/resources/cyril/16x16/uploadadd.png
share/filezilla/resources/cyril/theme.xml
+share/filezilla/resources/default/480x480/ascii.png
+share/filezilla/resources/default/480x480/auto.png
+share/filezilla/resources/default/480x480/binary.png
+share/filezilla/resources/default/480x480/bookmark.png
+share/filezilla/resources/default/480x480/bookmarks.png
+share/filezilla/resources/default/480x480/cancel.png
+share/filezilla/resources/default/480x480/compare.png
+share/filezilla/resources/default/480x480/disconnect.png
+share/filezilla/resources/default/480x480/download.png
+share/filezilla/resources/default/480x480/downloadadd.png
+share/filezilla/resources/default/480x480/file.png
+share/filezilla/resources/default/480x480/filter.png
+share/filezilla/resources/default/480x480/find.png
+share/filezilla/resources/default/480x480/folder.png
+share/filezilla/resources/default/480x480/folderback.png
+share/filezilla/resources/default/480x480/folderclosed.png
+share/filezilla/resources/default/480x480/folderup.png
+share/filezilla/resources/default/480x480/help.png
+share/filezilla/resources/default/480x480/localtreeview.png
+share/filezilla/resources/default/480x480/lock.png
+share/filezilla/resources/default/480x480/logview.png
+share/filezilla/resources/default/480x480/processqueue.png
+share/filezilla/resources/default/480x480/queueview.png
+share/filezilla/resources/default/480x480/reconnect.png
+share/filezilla/resources/default/480x480/refresh.png
+share/filezilla/resources/default/480x480/remotetreeview.png
+share/filezilla/resources/default/480x480/server.png
+share/filezilla/resources/default/480x480/showhidden.png
+share/filezilla/resources/default/480x480/sitemanager.png
+share/filezilla/resources/default/480x480/speedlimits.png
+share/filezilla/resources/default/480x480/symlink.png
+share/filezilla/resources/default/480x480/synchronize.png
+share/filezilla/resources/default/480x480/synctransfer.png
+share/filezilla/resources/default/480x480/upload.png
+share/filezilla/resources/default/480x480/uploadadd.png
+share/filezilla/resources/default/theme.xml
share/filezilla/resources/defaultfilters.xml
-share/filezilla/resources/down.png
share/filezilla/resources/dropdown.png
share/filezilla/resources/finished.wav
share/filezilla/resources/flatzilla/16x16/ascii.png
@@ -394,6 +414,7 @@ share/filezilla/resources/lone/theme.xml
share/filezilla/resources/minimal/16x16/ascii.png
share/filezilla/resources/minimal/16x16/auto.png
share/filezilla/resources/minimal/16x16/binary.png
+share/filezilla/resources/minimal/16x16/bookmark.png
share/filezilla/resources/minimal/16x16/bookmarks.png
share/filezilla/resources/minimal/16x16/cancel.png
share/filezilla/resources/minimal/16x16/compare.png
@@ -639,20 +660,17 @@ share/filezilla/resources/tango/48x48/unknown.png
share/filezilla/resources/tango/48x48/upload.png
share/filezilla/resources/tango/48x48/uploadadd.png
share/filezilla/resources/tango/theme.xml
-share/filezilla/resources/theme.xml
-share/filezilla/resources/up.png
share/filezilla/resources/xrc/certificate.xrc
share/filezilla/resources/xrc/dialogs.xrc
share/filezilla/resources/xrc/inputdialog.xrc
share/filezilla/resources/xrc/menus.xrc
share/filezilla/resources/xrc/netconfwizard.xrc
-share/filezilla/resources/xrc/quickconnectbar.xrc
share/filezilla/resources/xrc/settings.xrc
share/filezilla/resources/xrc/sitemanager.xrc
-share/filezilla/resources/xrc/toolbar.xrc
share/filezilla/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
share/icons/hicolor/48x48/apps/filezilla.png
share/icons/hicolor/scalable/apps/filezilla.svg
share/locale/an/LC_MESSAGES/filezilla.mo
diff --git a/net/filezilla/distinfo b/net/filezilla/distinfo
index 0fb560e1475..020e3fb5934 100644
--- a/net/filezilla/distinfo
+++ b/net/filezilla/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.30 2016/10/21 15:29:11 wiz Exp $
+$NetBSD: distinfo,v 1.31 2017/01/01 15:49:13 wiz Exp $
-SHA1 (FileZilla_3.21.0_src.tar.bz2) = 18f5cb6dbae22c0d394e0807acc067940db7b584
-RMD160 (FileZilla_3.21.0_src.tar.bz2) = 96a947a46025c6302529d099328606a6660ffe7f
-SHA512 (FileZilla_3.21.0_src.tar.bz2) = d58573c58e524a257cdbcb60fdb5c749d8e4f8a390b728b458721944b3e836cedf3478ff55565885ff1853ddb3f368d6e6e6d45142f19a9a4ee755b88ceb56b4
-Size (FileZilla_3.21.0_src.tar.bz2) = 4428270 bytes
-SHA1 (patch-src_interface_queue.cpp) = 6193fa6e29dd5ef709d6c4f8f27947ce1e7fa653
+SHA1 (FileZilla_3.23.0.2_src.tar.bz2) = 647911206575dda90fbb9a05474c19700ee1bbf9
+RMD160 (FileZilla_3.23.0.2_src.tar.bz2) = 0f95c4f4b8643652a7fb513d5f6df4b99f06133b
+SHA512 (FileZilla_3.23.0.2_src.tar.bz2) = 249082cb22aa03858a876b8e0087e8fba64540e1fbfada56a85bcd4474e8781132b413ec0d31b1c137e44a46b6b3dce145d1eceaef58f1f3f51d8f3c32dd9920
+Size (FileZilla_3.23.0.2_src.tar.bz2) = 4662448 bytes
SHA1 (patch-src_putty_unix_uxshare.c) = 0c3102c10b742c461fe032f081d1a642c6fd6a59
diff --git a/net/filezilla/patches/patch-src_interface_queue.cpp b/net/filezilla/patches/patch-src_interface_queue.cpp
deleted file mode 100644
index 8b425866bbb..00000000000
--- a/net/filezilla/patches/patch-src_interface_queue.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_interface_queue.cpp,v 1.1 2016/10/21 15:29:11 wiz Exp $
-
-Upstream patch for an assert():
-https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/src/interface/queue.cpp?view=patch&r1=7884&r2=7883&pathrev=7884
-
---- src/interface/queue.cpp.orig 2016-05-19 07:57:30.000000000 +0000
-+++ src/interface/queue.cpp
-@@ -1049,12 +1049,20 @@ void CQueueViewBase::UpdateSelections_It
- SetItemState(itemsToSelect.front(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
- itemsToSelect.pop_front();
- }
-- if (itemsToSelect.empty())
-- SetItemState(item, 0, wxLIST_STATE_SELECTED);
-- else if (itemsToSelect.front() == item)
-+ if (itemsToSelect.front() == item) {
- itemsToSelect.pop_front();
-+ }
-+ else {
-+ SetItemState(item, 0, wxLIST_STATE_SELECTED);
-+ }
-
- itemsToSelect.push_back(item + count);
-+ if (item + count < GetItemCount()) {
-+ // On generic list controls, new items may be selected by default after
-+ // increasing the item count: Internally it sometimes keeps track
-+ // of only unselected items.
-+ itemsToSelect.push_back(item + count);
-+ }
-
- item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- }
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 11:52:00 +0000