Deal with former namespace pollution from libbson.

6 files changed, 106 insertions, 1 deletions

diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index 5e818a58484..795590fa15e 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2017/06/24 04:24:56 kamil Exp $
+$NetBSD: distinfo,v 1.20 2017/07/11 19:35:51 joerg Exp $
 
 SHA1 (mongodb-src-r3.4.4.tar.gz) = 6f9f2d8a3c1c2f4089fd03f8be0b86ff0431d955
 RMD160 (mongodb-src-r3.4.4.tar.gz) = 2a65f380204a92762ceea2be35dbe2c671e106f6
@@ -7,13 +7,18 @@ Size (mongodb-src-r3.4.4.tar.gz) = 39867133 bytes
 SHA1 (patch-SConstruct) = 5e920c85dd27f1dd761fe7083074fed0eb1edeae
 SHA1 (patch-debian_mongod.conf) = e5074b5f7ad50560b99d652feab58da764ba542c
 SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5
+SHA1 (patch-src_mongo_db_dbwebserver.cpp) = 1e7bb9588930742839d2bc9e26b33751a64f98c7
 SHA1 (patch-src_mongo_db_fts_unicode_string.cpp) = 98c5b1b39c07190f08ec9f22ec3002b0a803f72f
+SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312
 SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
+SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726
 SHA1 (patch-src_mongo_platform_random.cpp) = 59c31e55fc2dc5a2b82b8f16dacf8736d8354cdb
 SHA1 (patch-src_mongo_platform_stack__locator__dragonfly.cpp) = fb885c491e4de1cfbc2875620d854af726e5b45f
 SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3b09e86b2401555b6ab4c31d14c0693d766119c2
+SHA1 (patch-src_mongo_shell_bench.cpp) = c0fd15347d35e37daf87b642148215dee3ab7220
 SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = f975925f56125d48b5124894fa1adf1382a634d2
 SHA1 (patch-src_mongo_util_intrusive__counter.h) = 9f1af59e1bc86e33bf183a6dda1737007afc7a18
+SHA1 (patch-src_mongo_util_net_miniwebserver.cpp) = 3715e826b8d03793066a84b2c1680c32c6ee6368
 SHA1 (patch-src_mongo_util_processinfo__dragonfly.cpp) = 62c236ce820dfe81f45625b15e022cca0f2c10ee
 SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 6eabe5ffec4168bb9ba8a58b7d742772d38b4714
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083
diff --git a/databases/mongodb/patches/patch-src_mongo_db_dbwebserver.cpp b/databases/mongodb/patches/patch-src_mongo_db_dbwebserver.cpp
new file mode 100644
index 00000000000..99fc9bfed1a
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_mongo_db_dbwebserver.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_mongo_db_dbwebserver.cpp,v 1.1 2017/07/11 19:35:51 joerg Exp $
+
+--- src/mongo/db/dbwebserver.cpp.orig	2017-07-11 17:07:27.098292902 +0000
++++ src/mongo/db/dbwebserver.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include "mongo/db/dbwebserver.h"
+ 
++#include <string>
+ #include <pcrecpp.h>
+ 
+ #include "mongo/base/init.h"
+@@ -67,6 +68,7 @@ namespace mongo {
+ using std::map;
+ using std::stringstream;
+ using std::vector;
++using std::string;
+ 
+ using namespace html;
+ 
diff --git a/databases/mongodb/patches/patch-src_mongo_db_matcher_expression__leaf.cpp b/databases/mongodb/patches/patch-src_mongo_db_matcher_expression__leaf.cpp
new file mode 100644
index 00000000000..ac3c9616c07
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_mongo_db_matcher_expression__leaf.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_mongo_db_matcher_expression__leaf.cpp,v 1.1 2017/07/11 19:35:51 joerg Exp $
+
+--- src/mongo/db/matcher/expression_leaf.cpp.orig	2017-07-11 17:17:17.311043545 +0000
++++ src/mongo/db/matcher/expression_leaf.cpp
+@@ -31,6 +31,7 @@
+ #include "mongo/db/matcher/expression_leaf.h"
+ 
+ #include <cmath>
++#include <string>
+ #include <pcrecpp.h>
+ 
+ #include "mongo/bson/bsonelement_comparator.h"
+@@ -45,6 +46,7 @@
+ #include "mongo/util/mongoutils/str.h"
+ 
+ namespace mongo {
++using std::string;
+ 
+ Status LeafMatchExpression::setPath(StringData path) {
+     _path = path;
diff --git a/databases/mongodb/patches/patch-src_mongo_db_repl_master__slave.cpp b/databases/mongodb/patches/patch-src_mongo_db_repl_master__slave.cpp
new file mode 100644
index 00000000000..cce2d033c61
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_mongo_db_repl_master__slave.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_mongo_db_repl_master__slave.cpp,v 1.1 2017/07/11 19:35:51 joerg Exp $
+
+--- src/mongo/db/repl/master_slave.cpp.orig	2017-07-11 17:40:23.338075821 +0000
++++ src/mongo/db/repl/master_slave.cpp
+@@ -45,6 +45,7 @@
+ #include "mongo/db/repl/master_slave.h"
+ 
+ #include <pcrecpp.h>
++#include <string>
+ 
+ #include "mongo/db/auth/authorization_manager.h"
+ #include "mongo/db/auth/authorization_session.h"
+@@ -78,6 +79,7 @@ using std::endl;
+ using std::max;
+ using std::min;
+ using std::set;
++using std::string;
+ using std::stringstream;
+ using std::unique_ptr;
+ using std::vector;
diff --git a/databases/mongodb/patches/patch-src_mongo_shell_bench.cpp b/databases/mongodb/patches/patch-src_mongo_shell_bench.cpp
new file mode 100644
index 00000000000..addb02b88fd
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_mongo_shell_bench.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_mongo_shell_bench.cpp,v 1.1 2017/07/11 19:35:51 joerg Exp $
+
+--- src/mongo/shell/bench.cpp.orig	2017-07-11 16:39:09.026014232 +0000
++++ src/mongo/shell/bench.cpp
+@@ -34,6 +34,7 @@
+ 
+ #include "mongo/shell/bench.h"
+ 
++#include <string>
+ #include <iostream>
+ #include <pcrecpp.h>
+ 
+@@ -78,6 +79,7 @@ namespace mongo {
+ using std::unique_ptr;
+ using std::cout;
+ using std::map;
++using std::string;
+ 
+ const std::map<OpType, std::string> opTypeName{{OpType::NONE, "none"},
+                                                {OpType::NOP, "nop"},
diff --git a/databases/mongodb/patches/patch-src_mongo_util_net_miniwebserver.cpp b/databases/mongodb/patches/patch-src_mongo_util_net_miniwebserver.cpp
new file mode 100644
index 00000000000..29a8c8d90ca
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_mongo_util_net_miniwebserver.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_mongo_util_net_miniwebserver.cpp,v 1.1 2017/07/11 19:35:51 joerg Exp $
+
+--- src/mongo/util/net/miniwebserver.cpp.orig	2017-07-11 17:42:54.304511569 +0000
++++ src/mongo/util/net/miniwebserver.cpp
+@@ -33,6 +33,7 @@
+ 
+ #include "mongo/util/net/miniwebserver.h"
+ 
++#include <string>
+ #include <pcrecpp.h>
+ 
+ #include "mongo/config.h"
+@@ -45,6 +46,7 @@
+ namespace mongo {
+ 
+ using std::shared_ptr;
++using std::string;
+ using std::stringstream;
+ using std::vector;
+