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

[mojca at macports.org]

Revision: 137011
          https://trac.macports.org/changeset/137011
Author:   mojca at macports.org
Date:     2015-06-02 10:24:05 -0700 (Tue, 02 Jun 2015)
Log Message:
-----------
FileZilla: rename the variant, change '-' into '_' (closes #47917)

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

Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- trunk/dports/www/FileZilla/Portfile	2015-06-02 17:06:10 UTC (rev 137010)
+++ trunk/dports/www/FileZilla/Portfile	2015-06-02 17:24:05 UTC (rev 137011)
@@ -60,14 +60,14 @@
 # In theory gcc could work, but we need to disable llvm-gcc and we need to match stdlib with wxWidgets (= use libc++)
 compiler.blacklist-append *gcc* {clang < 425} macports-clang-3.0 macports-clang-3.1
 
-variant wxgtk30 conflicts wxwidgets30 wxwidgets30-libcxx description {Use wxWidgets 3.0 with GTK} {
+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} {
+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}
@@ -75,7 +75,7 @@
     destroot {              copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir} }
 }
 
-variant wxwidgets30-libcxx conflicts wxgtk30 wxwidgets30 description {Use wxWidgets 3.0 with libcxx (for < 10.9)} {
+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}
@@ -83,10 +83,10 @@
     destroot {              copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir} }
 }
 
-if {![variant_isset wxgtk30] && ![variant_isset wxwidgets30] && ![variant_isset wxwidgets30-libcxx]} {
+if {![variant_isset wxgtk30] && ![variant_isset wxwidgets30] && ![variant_isset wxwidgets30_libcxx]} {
     if {${os.major} <= 12} {
         # TODO: && configure.cxx_stdlib != libc++
-        default_variants +wxwidgets30-libcxx
+        default_variants +wxwidgets30_libcxx
     } else {
         default_variants +wxwidgets30
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150602/485559c3/attachment-0001.html>