diff options
| author | ale <ale@FreeBSD.org> | 2013-05-03 22:18:14 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2013-05-03 22:18:14 +0800 |
| commit | 3758819b39d281c6329912e13a6bcc19de040ff7 (patch) | |
| tree | 10ce9c068fe5a5e865617501fa3995e82c0e011d /databases | |
| parent | eff7ba20bff8bea9828ecf7fb04c6f5157489044 (diff) | |
| download | freebsd-ports-gnome-3758819b39d281c6329912e13a6bcc19de040ff7.tar.gz freebsd-ports-gnome-3758819b39d281c6329912e13a6bcc19de040ff7.tar.zst freebsd-ports-gnome-3758819b39d281c6329912e13a6bcc19de040ff7.zip | |
Really fix locale.
Diffstat (limited to 'databases')
3 files changed, 12 insertions, 23 deletions
diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile index 804f260f3cc0..7aefbd56315d 100644 --- a/databases/mongodb/Makefile +++ b/databases/mongodb/Makefile @@ -3,7 +3,7 @@ PORTNAME= mongodb PORTVERSION= 2.4.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases net MASTER_SITES= http://downloads.mongodb.org/src/ DISTNAME= ${PORTNAME}-src-r${PORTVERSION} diff --git a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v2_src_v2_path.cpp b/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v2_src_v2_path.cpp deleted file mode 100644 index 66786523db2e..000000000000 --- a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v2_src_v2_path.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/third_party/boost/libs/filesystem/v2/src/v2_path.cpp.orig 2013-05-01 18:59:55.000000000 +0200 -+++ src/third_party/boost/libs/filesystem/v2/src/v2_path.cpp 2013-05-01 19:02:01.000000000 +0200 -@@ -30,7 +30,7 @@ - - #include <cwchar> // for std::mbstate_t - --#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -+#if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__) - # include <boost/filesystem/detail/utf8_codecvt_facet.hpp> - #endif - -@@ -43,7 +43,7 @@ - // occurred before main(), preventing exceptions from being caught.) - std::locale & loc() - { --#if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) -+#if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__) && !defined(__FreeBSD__) - // ISO C calls this "the locale-specific native environment": - static std::locale lc(""); - #else // Mac OS diff --git a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp b/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp index b8b7f740d21e..1e0784100346 100644 --- a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp +++ b/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp @@ -1,5 +1,5 @@ ---- src/third_party/boost/libs/filesystem/v3/src/path.cpp.orig 2013-05-01 19:03:02.000000000 +0200 -+++ src/third_party/boost/libs/filesystem/v3/src/path.cpp 2013-05-01 19:03:46.000000000 +0200 +--- src/third_party/boost/libs/filesystem/v3/src/path.cpp.orig 2013-04-22 16:48:39.000000000 +0200 ++++ src/third_party/boost/libs/filesystem/v3/src/path.cpp 2013-05-03 14:46:44.000000000 +0200 @@ -35,7 +35,7 @@ #ifdef BOOST_WINDOWS_API # include "windows_file_codecvt.hpp" @@ -18,3 +18,12 @@ // "All BSD system functions expect their string parameters to be in UTF-8 encoding // and nothing else." See +@@ -822,7 +822,7 @@ + const path::codecvt_type*& path::wchar_t_codecvt_facet() + { + # if defined(BOOST_POSIX_API) && \ +- !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) ++ !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__)) + // A local static initialized by calling path::imbue ensures that std::locale(""), + // which may throw, is called only if path_locale and condecvt_facet will actually + // be used. Thus misconfigured environmental variables will only cause an |