Fix issues in freeBSD 9.3-RELEASE

Bump PORTREVISION

4 files changed, 91 insertions, 3 deletions

diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index dad891886694..862e51c55ede 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	poedit
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
 
@@ -17,7 +18,7 @@ LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		liblucene++.so:${PORTSDIR}/textproc/luceneplusplus
 
-USES=		gettext gmake pkgconfig desktop-file-utils
+USES=		compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
@@ -28,13 +29,14 @@ CONFIGURE_ENV=	WXRC="${WXRC_CMD}"
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
+## -stdlib=libc++
 LDFLAGS+=	-lpthread -L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=yes
 
-NLS_USES= gettext
-NLS_CONFIGURE_ENABLE= nls
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/editors/poedit/files/patch-src_gexecute.cpp b/editors/poedit/files/patch-src_gexecute.cpp
new file mode 100644
index 000000000000..c281c3a752a3
--- /dev/null
+++ b/editors/poedit/files/patch-src_gexecute.cpp
@@ -0,0 +1,36 @@
+--- src/gexecute.cpp.orig	2015-08-03 10:49:16 UTC
++++ src/gexecute.cpp
+@@ -32,6 +32,8 @@
+ #include <wx/stdpaths.h>
+ #include <wx/filename.h>
+ 
++#include <sstream>
++
+ #include "gexecute.h"
+ #include "errors.h"
+ #include "chooselang.h"
+@@ -49,6 +51,14 @@
+     using std::regex_match;
+ #endif
+ 
++static int strtoi(const std::string& s)
++{
++  std::istringstream str(s);
++  int i;
++  str >> i;
++  return i;
++}
++
+ namespace
+ {
+ 
+@@ -186,7 +196,8 @@ bool ExecuteGettextAndParseOutput(const 
+         wsmatch match;
+         if (regex_match(e, match, RE_ERROR))
+         {
+-            rec.line = std::stoi(match.str(1));
++            std::string str(match.str(1).begin(),match.str(2).end());
++            rec.line = strtoi(str);
+             rec.text = match.str(3);
+             errors.push_back(rec);
+             wxLogTrace("poedit.execute",
diff --git a/editors/poedit/files/patch-src_http__client__casablanca.cpp b/editors/poedit/files/patch-src_http__client__casablanca.cpp
new file mode 100644
index 000000000000..b9dcc957edd6
--- /dev/null
+++ b/editors/poedit/files/patch-src_http__client__casablanca.cpp
@@ -0,0 +1,40 @@
+--- src/http_client_casablanca.cpp.orig	2015-08-03 10:49:16 UTC
++++ src/http_client_casablanca.cpp
+@@ -30,10 +30,13 @@
+ 
+ #include <boost/algorithm/string/predicate.hpp>
+ 
++
+ #include <cpprest/asyncrt_utils.h>
+ #include <cpprest/http_client.h>
+ #include <cpprest/http_msg.h>
+ #include <cpprest/filestream.h>
++#include <sstream>
++
+ 
+ #ifdef _WIN32
+     #include <windows.h>
+@@ -66,6 +69,14 @@ struct json_dict::native
+     }
+ };
+ 
++static trtoi(const std::string& s)
++{
++    std::istringstream str(s);
++    int i;
++    str >> i;
++    return i;
++}
++
+ static inline json_dict make_json_dict(const web::json::value& x)
+ {
+     return std::make_shared<json_dict::native>(x);
+@@ -102,7 +113,7 @@ int json_dict::number(const char *name) 
+     {
+         // Some broken APIs may return strings instead of numbers, so lets try
+         // that too as a fallback
+-        return std::stoi(val.as_string());
++        return strtoi(val.as_string());
+     }
+ }
+ 
diff --git a/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp b/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp
new file mode 100644
index 000000000000..0bade0d17730
--- /dev/null
+++ b/editors/poedit/files/patch-src_tm_dump__legacy__tm.cpp
@@ -0,0 +1,10 @@
+--- src/tm/dump_legacy_tm.cpp.orig	2015-08-03 10:49:16 UTC
++++ src/tm/dump_legacy_tm.cpp
+@@ -28,6 +28,7 @@
+ #include <string>
+ #include <vector>
+ 
++#include <errno.h>
+ #include <string.h>
+ 
+ #ifdef DB_HEADER