Index: head/databases/mongodb34/Makefile =================================================================== --- head/databases/mongodb34/Makefile (revision 460155) +++ head/databases/mongodb34/Makefile (revision 460156) @@ -1,79 +1,78 @@ # $FreeBSD$ PORTNAME= mongodb DISTVERSIONPREFIX= r DISTVERSION= 3.4.9 PORTREVISION= 1 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ \ http://download.mongodb.org/src/ PKGNAMESUFFIX= ${PORTVERSION:R:S/.//} DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION} MAINTAINER= eric@camachat.org COMMENT= Distributed document-oriented "NoSQL" database # mongodb is AGPLv3, C++ driver is APACHE20 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)" LIB_DEPENDS= libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy \ libboost_system.so:devel/boost-libs TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo CONFLICTS_BUILD= mongo-cxx-driver CHOSEN_COMPILER_TYPE= clang USES= compiler:c++14-lang cpe python:build scons USE_RC_SUBR= mongod MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ --use-system-pcre --use-system-snappy \ --use-system-boost --use-system-zlib \ --cxx-std=14 --libc++ \ --runtime-hardening=on \ --disable-warnings-as-errors \ VERBOSE=on WITH_DEBUG= yes USERS= mongodb GROUPS= mongodb OPTIONS_DEFINE= SASL SSL OPTIONS_DEFAULT= SASL SSL SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client SSL_USES= ssl SSL_MAKE_ARGS= --ssl ALL_TARGET= core TEST_TARGET= unittests PORTSCOUT= limitw:1,even CPE_PRODUCT= mongodb post-install: .for f in mongo mongod mongoperf mongos ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample do-test: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\ ${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\ --suites=unittests --jobs=${MAKE_JOBS_NUMBER} .include Index: head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp =================================================================== --- head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp (nonexistent) +++ head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp (revision 460156) @@ -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; + } Property changes on: head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mongodb34-rocks/Makefile =================================================================== --- head/databases/mongodb34-rocks/Makefile (revision 460155) +++ head/databases/mongodb34-rocks/Makefile (revision 460156) @@ -1,90 +1,89 @@ # $FreeBSD$ PORTNAME= mongodb PORTVERSION= 3.4.6 DISTVERSIONPREFIX= r PORTREVISION= 4 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ \ http://download.mongodb.org/src/ PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}-rocks DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= numisemis@yahoo.com COMMENT= Distributed document-oriented database with a RocksDB Storage Engine # mongodb is AGPLv3, C++ driver is APACHE20 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)" LIB_DEPENDS= libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy \ libboost_system.so:devel/boost-libs \ librocksdb.so:databases/rocksdb \ liblz4.so:archivers/liblz4 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo USES= compiler:c++14-lang cpe python:build scons USE_RC_SUBR= mongod \ mongos USE_GITHUB= nodefault GH_TUPLE= mongodb-partners:mongo-rocks:r${PORTVERSION}:module/src/mongo/db/modules/rocks CHOSEN_COMPILER_TYPE= clang CXXSTD= c++14 CONFLICTS_BUILD= mongo-cxx-driver CONFLICTS_INSTALL= mongodb \ mongodb32 \ mongodb34 WITH_DEBUG=yes MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ --use-system-pcre --use-system-snappy \ --use-system-boost --use-system-zlib \ --libc++ --runtime-hardening=on \ --disable-warnings-as-errors \ VERBOSE=on USERS= mongodb GROUPS= mongodb PORTSCOUT= limitw:1,even CPE_PRODUCT= mongodb OPTIONS_DEFINE= SASL SSL OPTIONS_DEFAULT= SASL SSL SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client SSL_MAKE_ARGS= --ssl SSL_USES= ssl ALL_TARGET= core TEST_TARGET= unittests post-install: .for f in mongo mongod mongoperf mongos ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongod.conf.sample do-test: @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\ ${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\ --suites=unittests --jobs=${MAKE_JOBS_NUMBER} .include Index: head/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp =================================================================== --- head/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp (nonexistent) +++ head/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp (revision 460156) @@ -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; + } Property changes on: head/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property