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

[mojca at macports.org]

Revision: 110909
          https://trac.macports.org/changeset/110909
Author:   mojca at macports.org
Date:     2013-09-09 14:37:47 -0700 (Mon, 09 Sep 2013)
Log Message:
-----------
FileZilla: make sure that +wxgtk28 does not attempt to copy FileZilla.app (#40427)

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

Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- trunk/dports/www/FileZilla/Portfile	2013-09-09 20:56:22 UTC (rev 110908)
+++ trunk/dports/www/FileZilla/Portfile	2013-09-09 21:37:47 UTC (rev 110909)
@@ -55,6 +55,7 @@
     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} {
@@ -62,8 +63,10 @@
     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}
@@ -71,13 +74,6 @@
     configure.env-append    WXRC=${wxWidgets.wxrc}
 }
 
-if {![variant_isset wxgtk28]} {
-    # TODO: when FileZilla is built against wxGTK, it doesn't create an app; this needs fixing
-    destroot {
-        copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir}
-    }
-}
-
 if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
     if {[vercmp $xcodeversion 4.4] >= 0} {
         default_variants +wxgtk28
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130909/18f29716/attachment.html>