Ticket #55221: FileZilla.Portfile.diff

Portfile

@@ -24 +24 @@
 checksums           rmd160  390456877d3a8d3ac0896b1ad1bb00355fa2d41e \
                     sha256  e49621aeb07c89547508c9ef244e2226168e06b120f49d2c4d428d95f1adbfb7
 
+# wxWidgets-3.0 with support for C++11 on < 10.9
+wxWidgets.use       wxWidgets-3.0-cxx11
+
 depends_build       port:pkgconfig
 
 depends_lib         port:dbus \
@@ -32 +35 @@
                     port:libfilezilla \
                     port:libidn \
                     port:sqlite3 \
-                    port:xdg-utils
+                    port:xdg-utils \
+                    port:${wxWidgets.port}
 
 distname            ${name}_${version}_src
 
@@ -46 +50 @@
 configure.args      --with-tinyxml=builtin \
                     --with-pugixml=builtin \
                     --disable-manualupdatecheck \
-                    --disable-autoupdatecheck
+                    --disable-autoupdatecheck \
+                    --with-wxdir=${wxWidgets.wxdir}
 
-platform darwin {
-    configure.cxx_stdlib    libc++
-    depends_lib-append      port:libcxx
-    configure.ldflags-append \
-                            -stdlib=${configure.cxx_stdlib}
-}
-
-# gcc 4.2 doesn't suffice to build FileZilla on 10.6 and earlier
-# newer gcc compilers should also work
-if {${os.major} <= 10} {
-    compiler.whitelist macports-clang-3.4 macports-clang-3.5 macports-clang-3.6 macports-clang-3.7
-}
+configure.env       WXRC=${wxWidgets.wxrc}
 
 # FileZilla now requires thread_local keyword in C++11 (N2659), which is
 # supported since Xcode 8.0 [1][2], upstream clang 3.3 [3] and GCC 4.8 [4]
@@ -69 +63 @@
 # [4] https://gcc.gnu.org/projects/cxx-status.html#cxx11
 compiler.blacklist-append {clang < 800}
 
-variant wxgtk30 conflicts wxwidgets30 wxwidgets30_libcxx 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}
-}
-
-variant wxwidgets30 conflicts wxgtk30 wxwidgets30_libcxx 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} }
-}
-
-variant wxwidgets30_libcxx conflicts wxgtk30 wxwidgets30 description {Use wxWidgets 3.0 with libcxx (for < 10.9)} {
-    wxWidgets.use           wxWidgets-3.0-libcxx
-    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} }
-}
-
-if {![variant_isset wxgtk30] && ![variant_isset wxwidgets30] && ![variant_isset wxwidgets30_libcxx]} {
-    if {${os.major} <= 12} {
-        # TODO: && configure.cxx_stdlib != libc++
-        default_variants +wxwidgets30_libcxx
-    } else {
-        default_variants +wxwidgets30
-    }
+destroot {
+    copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir}
 }
 
 livecheck.type      regex