Ticket #43969: FileZilla_3.8.1_2014-06-09.Portfile.diff

Portfile

@@ -5 +5 @@
 PortGroup           wxWidgets 1.0
 
 name                FileZilla
-version             3.8.0
-revision            1
+version             3.8.1
+set nightly_date    2014-06-09
 categories          www aqua
 platforms           darwin
 maintainers         strasweb.fr:rudloff openmaintainer
@@ -19 +19 @@
                     and an intuitive graphical user interface.
 
 homepage            https://filezilla-project.org/
-master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
+# master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
+master_sites        https://filezilla-project.org/nightlies/${nightly_date}
 
-checksums           rmd160  f161795774b03bbce8720e40ddff6a5ca6d4fe9a \
-                    sha256  8d9c1c9812f916f83676e1930933683828579b40a9fba331c4757f84a02ec308
+checksums           rmd160  27729f1d48ecd83775f008f96c8dfa4548a38f40 \
+                    sha256  eb9f03b50551aa0999815b4d9c725ad31225718d6e3f9b922e7ec31eb33ef247
 
 depends_build       port:pkgconfig
 
+wxWidgets.use       wxWidgets-3.0
+
 depends_lib         port:dbus \
                     port:gettext \
                     port:gmp \
@@ -36 +39 @@
                     port:libidn \
                     port:nettle \
                     port:sqlite3 \
-                    port:xdg-utils
+                    port:xdg-utils \
+                    port:${wxWidgets.port}
 
-distname            ${name}_${version}_src
+# distname            ${name}_${version}_src
+distname            FileZilla3-src
 use_bzip2           yes
 worksrcdir          filezilla-${version}
 
-# http://trac.filezilla-project.org/ticket/8272
-patchfiles          patch-wxWidgets-3.0.diff
-
 # http://trac.filezilla-project.org/ticket/5473
 # http://sourceforge.net/p/tinyxml/patches/51/
 configure.args      --with-tinyxml=builtin \
                     --disable-manualupdatecheck \
-                    --disable-autoupdatecheck
+                    --disable-autoupdatecheck \
+                    --with-wxdir=${wxWidgets.wxdir}
 
-variant wxwidgets30 conflicts wxgtk28 wxwidgets28 description {Use wxWidgets 3.0 (not fully functional yet)} {
-    wxWidgets.use           wxWidgets-3.0
-    depends_lib-append      port:${wxWidgets.port}
-    configure.args-append   --with-wxdir=${wxWidgets.wxdir}
-    configure.env-append    WXRC=${wxWidgets.wxrc}
-    destroot {              copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir} }
-}
+configure.env-append \
+                    WXRC=${wxWidgets.wxrc}
 
-variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxWidgets 2.8} {
-    wxWidgets.use           wxWidgets-2.8
-    depends_lib-append      port:${wxWidgets.port}
-    configure.args-append   --with-wxdir=${wxWidgets.wxdir}
-    configure.env-append    WXRC=${wxWidgets.wxrc}
-    destroot {              copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir} }
+destroot {
+    copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir}
 }
 
-# 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}
-}
-
-if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
-    if {[vercmp $xcodeversion 4.4] >= 0} {
-        default_variants +wxgtk28
-    } else {
-        default_variants +wxwidgets28
-    }
-}
-
 livecheck.type      regex
 livecheck.url       ${homepage}download.php?type=client
 livecheck.regex     /${name}_(\[0-9.\]+)