<!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>[121090] trunk/dports/www/FileZilla/Portfile</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/121090">121090</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-17 03:23:02 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FileZilla: upgrade to the 3.8.1/nightly 2014-06-17 to get support for wx 3.0 (#44031, #43969, #42448)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillaPortfile">trunk/dports/www/FileZilla/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwFileZillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/FileZilla/Portfile (121089 => 121090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/Portfile 2014-06-17 10:17:32 UTC (rev 121089)
+++ trunk/dports/www/FileZilla/Portfile 2014-06-17 10:23:02 UTC (rev 121090)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx">
</span><span class="cx"> name FileZilla
</span><span class="cx"> version 3.8.1
</span><ins>+set nightly_date 2014-06-17
+revision 1
</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">@@ -18,13 +20,17 @@
</span><span class="cx"> and an intuitive graphical user interface.
</span><span class="cx">
</span><span class="cx"> homepage https://filezilla-project.org/
</span><del>-master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
</del><ins>+# temporary switch to nightly versions until wxWidgets 3.0 support
+# master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
+master_sites https://filezilla-project.org/nightlies/${nightly_date}
</ins><span class="cx">
</span><del>-checksums rmd160 6a1692fc1b6ca73b878d8b9c2dd147b1885cacf0 \
- sha256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f
</del><ins>+checksums rmd160 ff65842f17888b9492c706ca8eb10fcb6e46b291 \
+ sha256 896b189cc043dbf31a9bff547fc8e5c5e643bd08ab4efac424e1fbe742e19a78
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><ins>+#wxWidgets.use wxWidgets-3.0
+
</ins><span class="cx"> depends_lib port:dbus \
</span><span class="cx"> port:gettext \
</span><span class="cx"> port:gmp \
</span><span class="lines">@@ -36,52 +42,51 @@
</span><span class="cx"> port:nettle \
</span><span class="cx"> port:sqlite3 \
</span><span class="cx"> port:xdg-utils
</span><ins>+# port:${wxWidgets.port}
</ins><span class="cx">
</span><del>-distname ${name}_${version}_src
</del><ins>+# distname ${name}_${version}_src
+# TODO: just for the nightly
+distname FileZilla3-src
+dist_subdir ${name}/${nightly_date}
+
</ins><span class="cx"> use_bzip2 yes
</span><span class="cx"> worksrcdir filezilla-${version}
</span><span class="cx">
</span><del>-# http://trac.filezilla-project.org/ticket/8272
-patchfiles patch-wxWidgets-3.0.diff
</del><ins>+patchfiles patch-configure.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 class="cx"> configure.args --with-tinyxml=builtin \
</span><span class="cx"> --disable-manualupdatecheck \
</span><span class="cx"> --disable-autoupdatecheck
</span><ins>+# --with-wxdir=${wxWidgets.wxdir}
</ins><span class="cx">
</span><del>-variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxWidgets 3.0 (not fully functional yet)} {
- wxWidgets.use wxWidgets-3.0
</del><ins>+#configure.env-append \
+# WXRC=${wxWidgets.wxrc}
+#
+#destroot {
+# copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir}
+#}
+
+variant wxgtk30 conflicts wxwidgets30 description {Use wxWidgets 3.0 with GTK} {
+ wxWidgets.use wxGTK-3.0
</ins><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><span class="cx"> configure.env-append WXRC=${wxWidgets.wxrc}
</span><del>- destroot { copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir} }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxWidgets 2.8} {
- wxWidgets.use wxWidgets-2.8
</del><ins>+variant wxwidgets30 conflicts wxgtk30 description {Use wxWidgets 3.0} {
+ wxWidgets.use wxWidgets-3.0
</ins><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><span class="cx"> configure.env-append WXRC=${wxWidgets.wxrc}
</span><span class="cx"> destroot { copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir} }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: when FileZilla is built against wxGTK, it doesn't create an app; this needs (possibly an upstream) fix
-variant wxgtk28 conflicts wxwidgets28 wxwidgets30 description {Use wxWidgets 2.8 with GTK} {
- wxWidgets.use wxGTK-2.8
- depends_lib-append port:${wxWidgets.port}
- configure.args-append --with-wxdir=${wxWidgets.wxdir}
- configure.env-append WXRC=${wxWidgets.wxrc}
</del><ins>+if {![variant_isset wxwidgets30] && ![variant_isset wxgtk30]} {
+ default_variants +wxwidgets30
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
- if {[vercmp $xcodeversion 4.4] >= 0} {
- default_variants +wxgtk28
- } else {
- default_variants +wxwidgets28
- }
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}download.php?type=client
</span><span class="cx"> livecheck.regex /${name}_(\[0-9.\]+)
</span></span></pre>
</div>
</div>
</body>
</html>