aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2018-02-02 17:55:51 +0800
committerKoop Mast <kwm@rainbow-runner.nl>2018-02-04 06:33:32 +0800
commitee454609026e05af26d48b995d20e9911763f459 (patch)
tree59aa523df6ba9a46ec88d139dbc7a87c97d85669
parent1099523d75abe7c01e9eff1d8c8717ddc0a65346 (diff)
downloadfreebsd-ports-gnome-ee454609026e05af26d48b995d20e9911763f459.tar.gz
freebsd-ports-gnome-ee454609026e05af26d48b995d20e9911763f459.tar.zst
freebsd-ports-gnome-ee454609026e05af26d48b995d20e9911763f459.zip
databases/mongodb34{,-rocks}: switch to upstream Boost 1.66 fix
PR: 224090 224091
-rw-r--r--databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp4
-rw-r--r--databases/mongodb34/Makefile2
-rw-r--r--databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp b/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
index d63c3754d5ea..a54eb2a05567 100644
--- a/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
+++ b/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
@@ -1,5 +1,5 @@
-Drop unnecessary use of boost::make_optional
https://jira.mongodb.org/browse/SERVER-32516
+https://github.com/mongodb/mongo/commit/3c34eda8d8a3
--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC
+++ src/mongo/db/repl/oplog_fetcher.cpp
@@ -8,7 +8,7 @@ https://jira.mongodb.org/browse/SERVER-32516
return metadataResult.getStatus();
}
- oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
-+ oqMetadata = metadataResult.getValue();
++ oqMetadata = boost::make_optional(metadataResult.getValue());
}
return oqMetadata;
}
diff --git a/databases/mongodb34/Makefile b/databases/mongodb34/Makefile
index 83362fe9acfb..95fd9a69bae8 100644
--- a/databases/mongodb34/Makefile
+++ b/databases/mongodb34/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
DISTVERSION= 3.4.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/ \
diff --git a/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp b/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
index d63c3754d5ea..a54eb2a05567 100644
--- a/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
+++ b/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
@@ -1,5 +1,5 @@
-Drop unnecessary use of boost::make_optional
https://jira.mongodb.org/browse/SERVER-32516
+https://github.com/mongodb/mongo/commit/3c34eda8d8a3
--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC
+++ src/mongo/db/repl/oplog_fetcher.cpp
@@ -8,7 +8,7 @@ https://jira.mongodb.org/browse/SERVER-32516
return metadataResult.getStatus();
}
- oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
-+ oqMetadata = metadataResult.getValue();
++ oqMetadata = boost::make_optional(metadataResult.getValue());
}
return oqMetadata;
}