Index: head/ftp/filezilla/Makefile =================================================================== --- head/ftp/filezilla/Makefile (revision 395503) +++ head/ftp/filezilla/Makefile (revision 395504) @@ -1,62 +1,63 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= filezilla -PORTVERSION= 3.12.0.2 +PORTVERSION= 3.13.0 CATEGORIES= ftp MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION} DISTNAME= FileZilla_${PORTVERSION}_src MAINTAINER= matthew@reztek.cz COMMENT= Fast and reliable cross-platform FTP, FTPS, and SFTP client LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils BUILD_DEPENDS:= ${RUN_DEPENDS} LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libgnutls.so:${PORTSDIR}/security/gnutls \ libidn.so:${PORTSDIR}/dns/libidn \ - libtinyxml.so:${PORTSDIR}/textproc/tinyxml + libpugixml.so:${PORTSDIR}/textproc/pugixml +BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 standard library + INSTALLS_ICONS= yes -USES= compiler:c++11-lib gmake pkgconfig tar:bzip2 +USES= compiler:c++14-lang gmake pkgconfig tar:bzip2 USE_SQLITE= 3 USE_WX= 3.0 WX_CONF_ARGS= relative WX_UNICODE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= DBUS NLS OPTIONS_DEFAULT=DBUS NLS OPTIONS_SUB= yes DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_WITH= dbus NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-locales .if !defined(MAINTAINER_MODE) CONFIGURE_ARGS+= --disable-manualupdatecheck .endif .include .if ${CHOSEN_COMPILER_TYPE} == "gcc" -BROKEN_FreeBSD= GCC dies with Internal Compiler Error .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # needed for __atomic_exchange_8, __atmoic_fetch_add_8, __atomic_store_8 CFLAGS+= -march=i586 .endif .endif post-patch: ${REINPLACE_CMD} -Ee 's|(dummy) wxrc|\1 ${WXRC_CMD:T}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .include Index: head/ftp/filezilla/distinfo =================================================================== --- head/ftp/filezilla/distinfo (revision 395503) +++ head/ftp/filezilla/distinfo (revision 395504) @@ -1,2 +1,2 @@ -SHA256 (FileZilla_3.12.0.2_src.tar.bz2) = 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d -SIZE (FileZilla_3.12.0.2_src.tar.bz2) = 4440836 +SHA256 (FileZilla_3.13.0_src.tar.bz2) = e6c21b41b1318d0d75273aca94cfda3039c9847bdb5adc4b9d480ecdcdfa4fc7 +SIZE (FileZilla_3.13.0_src.tar.bz2) = 4542742 Index: head/ftp/filezilla/files/patch-src_interface_Makefile.am =================================================================== --- head/ftp/filezilla/files/patch-src_interface_Makefile.am (nonexistent) +++ head/ftp/filezilla/files/patch-src_interface_Makefile.am (revision 395504) @@ -0,0 +1,11 @@ +--- src/interface/Makefile.am.orig 2015-07-31 03:30:02 UTC ++++ src/interface/Makefile.am +@@ -155,7 +155,7 @@ noinst_HEADERS = aboutdialog.h \ + filter_conditions_dialog.h \ + filteredit.h \ + file_utils.h \ +- fzputtygen_interface.cpp \ ++ fzputtygen_interface.h \ + import.h \ + inputdialog.h \ + ipcmutex.h \ Property changes on: head/ftp/filezilla/files/patch-src_interface_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/ftp/filezilla/files/patch-src_interface_Makefile.in =================================================================== --- head/ftp/filezilla/files/patch-src_interface_Makefile.in (nonexistent) +++ head/ftp/filezilla/files/patch-src_interface_Makefile.in (revision 395504) @@ -0,0 +1,11 @@ +--- src/interface/Makefile.in.orig 2015-08-18 16:03:24 UTC ++++ src/interface/Makefile.in +@@ -630,7 +630,7 @@ noinst_HEADERS = aboutdialog.h \ + filter_conditions_dialog.h \ + filteredit.h \ + file_utils.h \ +- fzputtygen_interface.cpp \ ++ fzputtygen_interface.h \ + import.h \ + inputdialog.h \ + ipcmutex.h \ Property changes on: head/ftp/filezilla/files/patch-src_interface_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h =================================================================== --- head/ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h (nonexistent) +++ head/ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h (revision 395504) @@ -0,0 +1,43 @@ +--- src/interface/fzputtygen_interface.h.orig 2015-08-18 16:02:52 UTC ++++ src/interface/fzputtygen_interface.h +@@ -0,0 +1,40 @@ ++#ifndef FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER ++#define FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER ++ ++#include ++ ++class CFZPuttyGenInterface ++{ ++public: ++ CFZPuttyGenInterface(wxWindow* parent); ++ virtual ~CFZPuttyGenInterface(); ++ bool LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data); ++ ++ void EndProcess(); ++ void DeleteProcess(); ++ bool IsProcessCreated(); ++ bool IsProcessStarted(); ++ ++protected: ++ // return -1 on error ++ int NeedsConversion(wxString keyFile, bool silent); ++ ++ // return -1 on error ++ int IsKeyFileEncrypted(wxString keyFile, bool silent); ++ ++ wxProcess* m_pProcess{}; ++ bool m_initialized{}; ++ wxWindow* m_parent; ++ ++ enum ReplyCode { ++ success, ++ error, ++ failure ++ }; ++ ++ bool LoadProcess(bool silent); ++ bool Send(const wxString& cmd); ++ ReplyCode GetReply(wxString& reply); ++}; ++ ++#endif /* FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER */ Property changes on: head/ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property