[121090] trunk/dports/www/FileZilla/Portfile

[mojca at macports.org]

Revision: 121090
          https://trac.macports.org/changeset/121090
Author:   mojca at macports.org
Date:     2014-06-17 03:23:02 -0700 (Tue, 17 Jun 2014)
Log Message:
-----------
FileZilla: upgrade to the 3.8.1/nightly 2014-06-17 to get support for wx 3.0 (#44031, #43969, #42448)

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

Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- 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)
@@ -6,6 +6,8 @@
 
 name                FileZilla
 version             3.8.1
+set nightly_date    2014-06-17
+revision            1
 categories          www aqua
 platforms           darwin
 maintainers         mojca strasweb.fr:rudloff openmaintainer
@@ -18,13 +20,17 @@
                     and an intuitive graphical user interface.
 
 homepage            https://filezilla-project.org/
-master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
+# 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}
 
-checksums           rmd160  6a1692fc1b6ca73b878d8b9c2dd147b1885cacf0 \
-                    sha256  66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f
+checksums           rmd160  ff65842f17888b9492c706ca8eb10fcb6e46b291 \
+                    sha256  896b189cc043dbf31a9bff547fc8e5c5e643bd08ab4efac424e1fbe742e19a78
 
 depends_build       port:pkgconfig
 
+#wxWidgets.use      wxWidgets-3.0
+
 depends_lib         port:dbus \
                     port:gettext \
                     port:gmp \
@@ -36,52 +42,51 @@
                     port:nettle \
                     port:sqlite3 \
                     port:xdg-utils
+#                   port:${wxWidgets.port}
 
-distname            ${name}_${version}_src
+# distname          ${name}_${version}_src
+# TODO: just for the nightly
+distname            FileZilla3-src
+dist_subdir         ${name}/${nightly_date}
+
 use_bzip2           yes
 worksrcdir          filezilla-${version}
 
-# http://trac.filezilla-project.org/ticket/8272
-patchfiles          patch-wxWidgets-3.0.diff
+patchfiles          patch-configure.diff
 
 # http://trac.filezilla-project.org/ticket/5473
 # http://sourceforge.net/p/tinyxml/patches/51/
 configure.args      --with-tinyxml=builtin \
                     --disable-manualupdatecheck \
                     --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
+#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
     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} }
 }
 
-variant wxwidgets28 conflicts wxgtk28 wxwidgets30 description {Use 32-bit Carbon-based wxWidgets 2.8} {
-    wxWidgets.use           wxWidgets-2.8
+variant wxwidgets30 conflicts wxgtk30 description {Use wxWidgets 3.0} {
+    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} }
 }
 
-# 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 wxgtk30]} {
+    default_variants +wxwidgets30
 }
 
-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.\]+)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140617/817a3dd6/attachment-0001.html>