mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

- Update to 3.13.0

Browse Source 
PR:		202563
Submitted by:	matthew@reztek.cz (maintainer)
This commit is contained in:
Dmitry Marakasov 2015-08-28 15:44:38 +00:00
parent ac1c3bd4d1
commit 20ace5f382
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=395504
5 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ftp/filezilla/Makefile
View File

@ -2,7 +2,7 @@
# $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
@ -18,10 +18,12 @@ 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
@ -48,7 +50,6 @@ CONFIGURE_ARGS+= --disable-manualupdatecheck
.include <bsd.port.pre.mk>
.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

4
ftp/filezilla/distinfo
View File

@ -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

11
ftp/filezilla/files/patch-src_interface_Makefile.am Normal file
View File

@ -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 \

11
ftp/filezilla/files/patch-src_interface_Makefile.in Normal file
View File

@ -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 \

43
ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h Normal file
View File

@ -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 <wx/process.h>
+
+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 */