[134473] trunk/dports/www/FileZilla

[mojca at macports.org]

Revision: 134473
          https://trac.macports.org/changeset/134473
Author:   mojca at macports.org
Date:     2015-03-26 14:15:41 -0700 (Thu, 26 Mar 2015)
Log Message:
-----------
FileZilla: upgrade to 3.10.2 (#47271)

Modified Paths:
--------------
    trunk/dports/www/FileZilla/Portfile

Added Paths:
-----------
    trunk/dports/www/FileZilla/files/patch-upstream-r6543.diff

Removed Paths:
-------------
    trunk/dports/www/FileZilla/files/patch-configure.diff
    trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff

Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- trunk/dports/www/FileZilla/Portfile	2015-03-26 21:13:20 UTC (rev 134472)
+++ trunk/dports/www/FileZilla/Portfile	2015-03-26 21:15:41 UTC (rev 134473)
@@ -5,7 +5,7 @@
 PortGroup           wxWidgets 1.0
 
 name                FileZilla
-version             3.10.1.1
+version             3.10.2
 categories          www aqua
 platforms           darwin
 maintainers         mojca strasweb.fr:rudloff openmaintainer
@@ -20,8 +20,8 @@
 homepage            https://filezilla-project.org/
 master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
 
-checksums           rmd160  881b2aafffc207775df00d4371fd36c3821eb1a0 \
-                    sha256  67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d
+checksums           rmd160  203f5ff359ec9742228c45375397a5178b286dc5 \
+                    sha256  c08ee3bff4ce35010a5f32610ef699081662c9f8c51c20740f719e653ce9b611
 
 depends_build       port:pkgconfig
 
@@ -37,8 +37,7 @@
 use_bzip2           yes
 worksrcdir          filezilla-${version}
 
-patchfiles          patch-src-include-socket.h.diff \
-                    patch-configure.diff
+patchfiles          patch-upstream-r6543.diff
 
 # http://trac.filezilla-project.org/ticket/5473
 # http://sourceforge.net/p/tinyxml/patches/51/

Deleted: trunk/dports/www/FileZilla/files/patch-configure.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-configure.diff	2015-03-26 21:13:20 UTC (rev 134472)
+++ trunk/dports/www/FileZilla/files/patch-configure.diff	2015-03-26 21:15:41 UTC (rev 134473)
@@ -1,20 +0,0 @@
---- configure.orig
-+++ configure
-@@ -16392,7 +16391,7 @@ main ()
-   return 0;
- }
- _ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
-@@ -16406,7 +16405,7 @@ $as_echo "no" >&6; }
- 
- 
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CPPFLAGS="$CPPFLAGS_OLD"
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'

Deleted: trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff	2015-03-26 21:13:20 UTC (rev 134472)
+++ trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff	2015-03-26 21:15:41 UTC (rev 134473)
@@ -1,13 +0,0 @@
-http://svn.filezilla-project.org/filezilla?view=revision&revision=6415
-
---- src/include/socket.h.orig
-+++ src/include/socket.h
-@@ -3,6 +3,8 @@
- 
- #include "event_handler.h"
- 
-+#include <errno.h>
-+
- // IPv6 capable, non-blocking socket class for use with wxWidgets.
- // Error codes are the same as used by the POSIX socket functions,
- // see 'man 2 socket', 'man 2 connect', ...

Added: trunk/dports/www/FileZilla/files/patch-upstream-r6543.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-upstream-r6543.diff	                        (rev 0)
+++ trunk/dports/www/FileZilla/files/patch-upstream-r6543.diff	2015-03-26 21:15:41 UTC (rev 134473)
@@ -0,0 +1,41 @@
+http://svn.filezilla-project.org/filezilla?view=revision&revision=6543
+
+--- src/interface/Mainfrm.h 2015/03/02 20:28:30 6542
++++ src/interface/Mainfrm.h 2015/03/03 15:54:36 6543
+@@ -1,13 +1,18 @@
+ #ifndef __MAINFRM_H__
+ #define __MAINFRM_H__
+ 
++#include "statusbar.h"
++#include "engine_context.h"
++
++#include "wx/timer.h"
++
+ #ifndef __WXMAC__
+ #include <wx/taskbar.h>
+ #endif
+ 
+-#include "statusbar.h"
+-
+-#include "engine_context.h"
++#if FZ_MANUALUPDATECHECK
++#include "updater.h"
++#endif
+ 
+ class CAsyncRequestQueue;
+ class CContextControl;
+@@ -25,13 +30,7 @@
+ class CToolBar;
+ class CWindowStateManager;
+ 
+-
+-#if FZ_MANUALUPDATECHECK
+-#include "updater.h"
+-#endif
+-class CWindowStateManager;
+-
+-class CMainFrame : public wxNavigationEnabled<wxFrame>
++class CMainFrame final : public wxNavigationEnabled<wxFrame>
+ #if FZ_MANUALUPDATECHECK
+ 	, protected CUpdateHandler
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150326/1a488e9d/attachment-0001.html>