svn commit: r460156 - in head/databases: mongodb34 mongodb34-rocks mongodb34-rocks/files mongodb34/files

[Jan Beich]

Author: jbeich
Date: Sun Jan 28 02:45:32 2018
New Revision: 460156
URL: https://svnweb.freebsd.org/changeset/ports/460156

Log:
  databases/mongodb34{,-rocks}: unbreak with boost 1.66
  
  PR:		224090 224091
  Approved by:	maintainer timeout (1 month)

Added:
  head/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp   (contents, props changed)
  head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp   (contents, props changed)
Modified:
  head/databases/mongodb34-rocks/Makefile   (contents, props changed)
  head/databases/mongodb34/Makefile   (contents, props changed)

Modified: head/databases/mongodb34-rocks/Makefile
==============================================================================
--- head/databases/mongodb34-rocks/Makefile	Sun Jan 28 01:39:12 2018	(r460155)
+++ head/databases/mongodb34-rocks/Makefile	Sun Jan 28 02:45:32 2018	(r460156)
@@ -20,7 +20,6 @@ LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
 BROKEN=		fails to link
-BROKEN=		fails to build with boost 1.66, see bug 224091
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"

Added: head/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp	Sun Jan 28 02:45:32 2018	(r460156)
@@ -0,0 +1,14 @@
+Drop unnecessary use of boost::make_optional
+https://jira.mongodb.org/browse/SERVER-32516
+
+--- src/mongo/db/repl/oplog_fetcher.cpp.orig	2017-09-07 19:28:48 UTC
++++ src/mongo/db/repl/oplog_fetcher.cpp
+@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
+         if (!metadataResult.isOK()) {
+             return metadataResult.getStatus();
+         }
+-        oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
++        oqMetadata = metadataResult.getValue();
+     }
+     return oqMetadata;
+ }

Modified: head/databases/mongodb34/Makefile
==============================================================================
--- head/databases/mongodb34/Makefile	Sun Jan 28 01:39:12 2018	(r460155)
+++ head/databases/mongodb34/Makefile	Sun Jan 28 02:45:32 2018	(r460156)
@@ -18,7 +18,6 @@ COMMENT=	Distributed document-oriented "NoSQL" databas
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
-BROKEN=		fails to build with boost 1.66, see bug 224090
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"
 

Added: head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp	Sun Jan 28 02:45:32 2018	(r460156)
@@ -0,0 +1,14 @@
+Drop unnecessary use of boost::make_optional
+https://jira.mongodb.org/browse/SERVER-32516
+
+--- src/mongo/db/repl/oplog_fetcher.cpp.orig	2017-09-07 19:28:48 UTC
++++ src/mongo/db/repl/oplog_fetcher.cpp
+@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
+         if (!metadataResult.isOK()) {
+             return metadataResult.getStatus();
+         }
+-        oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
++        oqMetadata = metadataResult.getValue();
+     }
+     return oqMetadata;
+ }