[132922] trunk/dports/www/FileZilla
mojca at macports.org
mojca at macports.org
Fri Feb 13 13:04:33 PST 2015
Revision: 132922
https://trac.macports.org/changeset/132922
Author: mojca at macports.org
Date: 2015-02-13 13:04:33 -0800 (Fri, 13 Feb 2015)
Log Message:
-----------
FileZilla: upgrade to 3.10.1.1, add support for libcxx on OS X < 10.9 (closes #46768)
Modified Paths:
--------------
trunk/dports/www/FileZilla/Portfile
Added Paths:
-----------
trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff
Removed Paths:
-------------
trunk/dports/www/FileZilla/files/patch-configure.diff
Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- trunk/dports/www/FileZilla/Portfile 2015-02-13 17:40:19 UTC (rev 132921)
+++ trunk/dports/www/FileZilla/Portfile 2015-02-13 21:04:33 UTC (rev 132922)
@@ -5,9 +5,7 @@
PortGroup wxWidgets 1.0
name FileZilla
-version 3.8.1
-set nightly_date 2014-06-17
-revision 1
+version 3.10.1.1
categories www aqua
platforms darwin
maintainers mojca strasweb.fr:rudloff openmaintainer
@@ -20,69 +18,54 @@
and an intuitive graphical user interface.
homepage https://filezilla-project.org/
-# 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} \
- https://trac.macports.org/raw-attachment/ticket/44126
+master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
-checksums rmd160 ff65842f17888b9492c706ca8eb10fcb6e46b291 \
- sha256 896b189cc043dbf31a9bff547fc8e5c5e643bd08ab4efac424e1fbe742e19a78
+checksums rmd160 881b2aafffc207775df00d4371fd36c3821eb1a0 \
+ sha256 67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d
depends_build port:pkgconfig
-#wxWidgets.use wxWidgets-3.0
-
depends_lib port:dbus \
port:gettext \
- port:gmp \
port:gnutls \
- port:libgpg-error \
- port:libgcrypt \
- port:libiconv \
port:libidn \
- port:nettle \
port:sqlite3 \
port:xdg-utils
-# port:${wxWidgets.port}
-# distname ${name}_${version}_src
-# TODO: just for the nightly
-distname FileZilla3-src
-dist_subdir ${name}/${nightly_date}
+distname ${name}_${version}_src
use_bzip2 yes
worksrcdir filezilla-${version}
-patchfiles patch-configure.diff
+patchfiles patch-src-include-socket.h.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}
-#configure.env-append \
-# WXRC=${wxWidgets.wxrc}
-#
-#destroot {
-# copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir}
-#}
+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.3 macports-clang-3.5
+ compiler.whitelist macports-clang-3.4 macports-clang-3.5 macports-clang-3.6 macports-clang-3.7
}
-variant wxgtk30 conflicts wxwidgets30 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 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}
@@ -90,10 +73,23 @@
destroot { copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir} }
}
-if {![variant_isset wxwidgets30] && ![variant_isset wxgtk30]} {
- default_variants +wxwidgets30
+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
+ }
+}
+
livecheck.type regex
livecheck.url ${homepage}download.php?type=client
livecheck.regex /${name}_(\[0-9.\]+)
Deleted: trunk/dports/www/FileZilla/files/patch-configure.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-configure.diff 2015-02-13 17:40:19 UTC (rev 132921)
+++ trunk/dports/www/FileZilla/files/patch-configure.diff 2015-02-13 21:04:33 UTC (rev 132922)
@@ -1,62 +0,0 @@
-http://trac.filezilla-project.org/ticket/9582
-
---- configure.orig
-+++ configure
-@@ -17870,12 +17870,12 @@ if test -n "$LIBGTK_CFLAGS"; then
- pkg_cv_LIBGTK_CFLAGS="$LIBGTK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LIBGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
-+ pkg_cv_LIBGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -17887,12 +17887,12 @@ if test -n "$LIBGTK_LIBS"; then
- pkg_cv_LIBGTK_LIBS="$LIBGTK_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LIBGTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
-+ pkg_cv_LIBGTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -17913,21 +17913,21 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LIBGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0" 2>&1`
-+ LIBGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0" 2>&1`
- else
-- LIBGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0" 2>&1`
-+ LIBGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBGTK_PKG_ERRORS" >&5
-
-
-- as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
-+ as_fn_error $? "gtk+-3.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
-
- elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-
-- as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
-+ as_fn_error $? "gtk+-3.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
-
- else
- LIBGTK_CFLAGS=$pkg_cv_LIBGTK_CFLAGS
Added: trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff (rev 0)
+++ trunk/dports/www/FileZilla/files/patch-src-include-socket.h.diff 2015-02-13 21:04:33 UTC (rev 132922)
@@ -0,0 +1,13 @@
+http://svn.filezilla-project.org/filezilla?view=revision&revision=6415
+
+--- src/include/socket.h.orig
++++ src/include/socket.h
+@@ -3,6 +3,8 @@
+
+ #include "event_handler.h"
+
++#include <errno.h>
++
+ // IPv6 capable, non-blocking socket class for use with wxWidgets.
+ // Error codes are the same as used by the POSIX socket functions,
+ // see 'man 2 socket', 'man 2 connect', ...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150213/07064fcd/attachment.html>
More information about the macports-changes
mailing list