Update libfilezilla to 0.5.3:

2016-06-20 - libfilezilla 0.5.3 released
New features:

    Add fz::replace_substrincs to search and replace substrings in std::(w)string

Bugfixes and minor changes:

    Explicitly request large file support on 32bit systems

2016-05-20 - libfilezilla 0.5.2 released
New features:

    Add fz::shared_optional::is_same that checks whether two instances share the same underlying pointer value, like a shallow equal.
    Add fz::int_to_hex_char as reverse to fz::hex_char_to_int

2016-05-09 - libfilezilla 0.5.1 released
New features:

    Add constructore to sparse_optional taking pointers

Bugfixes and minor changes:

    Fix compilation on systems where iconv's second argument is const

3 files changed, 7 insertions, 56 deletions

diff --git a/net/libfilezilla/Makefile b/net/libfilezilla/Makefile
index 84c88a17850..479f98f4907 100644
--- a/net/libfilezilla/Makefile
+++ b/net/libfilezilla/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2016/04/29 11:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/07/19 18:42:22 wiz Exp $
 
-DISTNAME=	libfilezilla-0.5.0
+DISTNAME=	libfilezilla-0.5.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=filezilla/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/libfilezilla/distinfo b/net/libfilezilla/distinfo
index 463061c5224..a9f8011b934 100644
--- a/net/libfilezilla/distinfo
+++ b/net/libfilezilla/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2016/04/29 14:14:16 wiz Exp $
+$NetBSD: distinfo,v 1.3 2016/07/19 18:42:22 wiz Exp $
 
-SHA1 (libfilezilla-0.5.0.tar.bz2) = dadd4c7a45ad913ed1820d6cd5e8d72d559c1212
-RMD160 (libfilezilla-0.5.0.tar.bz2) = bf92d8f127271482b189cd544108ff1eb16848f9
-SHA512 (libfilezilla-0.5.0.tar.bz2) = 24116fc6808f4d62fad1fc3ba15d3fc51261a2dc13ac6c5c6de71fa0cfce4bd328cc885974689f7f6549843167ba3ecee3febff64f9aba1ca71498b89ec93342
-Size (libfilezilla-0.5.0.tar.bz2) = 374549 bytes
-SHA1 (patch-lib_string.cpp) = 92c0827d3259855eb5176afcf6f3567b6ddd3a2c
+SHA1 (libfilezilla-0.5.3.tar.bz2) = 035c79d677ee7ab00aaf7b3b65e47139e955f072
+RMD160 (libfilezilla-0.5.3.tar.bz2) = bcc0905c81030c0b8ec563bd3017b404f82271cd
+SHA512 (libfilezilla-0.5.3.tar.bz2) = 73c1e5a8940e08dc96f511dc5dce7bdc17d2feada131b4459e8a65c074e48a04b7eb884e55a59ac1e04c72ae47cd596c8f668cd7086f302f86bdbb14a32e83cd
+Size (libfilezilla-0.5.3.tar.bz2) = 376339 bytes
diff --git a/net/libfilezilla/patches/patch-lib_string.cpp b/net/libfilezilla/patches/patch-lib_string.cpp
deleted file mode 100644
index 8f10e67d619..00000000000
--- a/net/libfilezilla/patches/patch-lib_string.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-lib_string.cpp,v 1.2 2016/04/29 14:14:16 wiz Exp $
-
-Fix build with different types of iconv().
-https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/lib/string.cpp?view=patch&r1=7361&r2=7464&pathrev=7464
-
---- lib/string.cpp.orig	2016-04-15 07:52:15.000000000 +0000
-+++ lib/string.cpp
-@@ -7,6 +7,8 @@
- #else
- #include <iconv.h>
- #include <strings.h>
-+
-+#include <type_traits>
- #endif
- 
- #include <cstdlib>
-@@ -88,6 +90,13 @@ std::wstring to_wstring(std::string cons
- 	return ret;
- }
- 
-+#ifndef FZ_WINDOWS
-+// On some platforms, e.g. NetBSD, the second argument to iconv is const.
-+// Depending which one is used, declare iconv_second_arg_type as either char* or char const*
-+extern "C" typedef size_t (*iconv_prototype_with_const)(iconv_t, char const**, size_t *, char**, size_t *);
-+typedef std::conditional<std::is_same<decltype(&iconv), iconv_prototype_with_const>::value, char const*, char*>::type iconv_second_arg_type;
-+#endif
-+
- std::wstring to_wstring_from_utf8(std::string const& in)
- {
- 	std::wstring ret;
-@@ -104,7 +113,7 @@ std::wstring to_wstring_from_utf8(std::s
- #else
- 		iconv_t cd = iconv_open("WCHAR_T", "UTF-8");
- 		if (cd != reinterpret_cast<iconv_t>(-1)) {
--			char * in_p = const_cast<char*>(in.c_str());
-+			auto in_p = const_cast<iconv_second_arg_type>(in.c_str());
- 			size_t in_len = in.size();
- 
- 			size_t out_len = in_len * sizeof(wchar_t) * 2;
-@@ -168,7 +177,7 @@ std::string FZ_PUBLIC_SYMBOL to_utf8(std
- #else
- 		iconv_t cd = iconv_open("UTF-8", "WCHAR_T");
- 		if (cd != reinterpret_cast<iconv_t>(-1)) {
--			char * in_p = reinterpret_cast<char*>(const_cast<wchar_t*>(in.c_str()));
-+			auto in_p = reinterpret_cast<iconv_second_arg_type>(const_cast<wchar_t*>(in.c_str()));
- 			size_t in_len = in.size() * sizeof(wchar_t);
- 
- 			size_t out_len = in.size() * 4;