<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134473] trunk/dports/www/FileZilla</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134473">134473</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-03-26 14:15:41 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FileZilla: upgrade to 3.10.2 (#47271)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillaPortfile">trunk/dports/www/FileZilla/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillafilespatchupstreamr6543diff">trunk/dports/www/FileZilla/files/patch-upstream-r6543.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillafilespatchconfigurediff">trunk/dports/www/FileZilla/files/patch-configure.diff</a></li>
<li><a href="#trunkdportswwwFileZillafilespatchsrcincludesockethdiff">trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwFileZillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/FileZilla/Portfile (134472 => 134473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name FileZilla
</span><del>-version 3.10.1.1
</del><ins>+version 3.10.2
</ins><span class="cx"> categories www aqua
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers mojca strasweb.fr:rudloff openmaintainer
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> homepage https://filezilla-project.org/
</span><span class="cx"> master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
</span><span class="cx">
</span><del>-checksums rmd160 881b2aafffc207775df00d4371fd36c3821eb1a0 \
- sha256 67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d
</del><ins>+checksums rmd160 203f5ff359ec9742228c45375397a5178b286dc5 \
+ sha256 c08ee3bff4ce35010a5f32610ef699081662c9f8c51c20740f719e653ce9b611
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -37,8 +37,7 @@
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> worksrcdir filezilla-${version}
</span><span class="cx">
</span><del>-patchfiles patch-src-include-socket.h.diff \
- patch-configure.diff
</del><ins>+patchfiles patch-upstream-r6543.diff
</ins><span class="cx">
</span><span class="cx"> # http://trac.filezilla-project.org/ticket/5473
</span><span class="cx"> # http://sourceforge.net/p/tinyxml/patches/51/
</span></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/FileZilla/files/patch-configure.diff (134472 => 134473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- 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'
</del></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchsrcincludesockethdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff (134472 => 134473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-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', ...
</del></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchupstreamr6543diff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/FileZilla/files/patch-upstream-r6543.diff (0 => 134473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+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
</ins></span></pre>
</div>
</div>
</body>
</html>