From owner-svn-ports-head@freebsd.org Sun Jan 28 02:45:33 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8CF2ED3A2A; Sun, 28 Jan 2018 02:45:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 72963872D8; Sun, 28 Jan 2018 02:45:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6C066138FA; Sun, 28 Jan 2018 02:45:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0S2jXC6091304; Sun, 28 Jan 2018 02:45:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0S2jXUP091300; Sun, 28 Jan 2018 02:45:33 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801280245.w0S2jXUP091300@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Jan 2018 02:45:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460156 - in head/databases: mongodb34 mongodb34-rocks mongodb34-rocks/files mongodb34/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/databases: mongodb34 mongodb34-rocks mongodb34-rocks/files mongodb34/files X-SVN-Commit-Revision: 460156 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jan 2018 02:45:34 -0000 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> p + if (!metadataResult.isOK()) { + return metadataResult.getStatus(); + } +- oqMetadata = boost::make_optional(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> p + if (!metadataResult.isOK()) { + return metadataResult.getStatus(); + } +- oqMetadata = boost::make_optional(metadataResult.getValue()); ++ oqMetadata = metadataResult.getValue(); + } + return oqMetadata; + }