Index: head/databases/mongodb/Makefile =================================================================== --- head/databases/mongodb/Makefile (revision 414441) +++ head/databases/mongodb/Makefile (revision 414442) @@ -1,78 +1,78 @@ # Created by: Mirko Zinn # $FreeBSD$ PORTNAME= mongodb -PORTVERSION= 2.6.7 +PORTVERSION= 2.6.12 CATEGORIES= databases net MASTER_SITES= http://downloads.mongodb.org/src/ DISTNAME= ${PORTNAME}-src-r${PORTVERSION} MAINTAINER= ale@FreeBSD.org COMMENT= NOSQL distributed document-oriented database # mongodb is AGPLv3, C++ driver is APACHE20 LICENSE= AGPLv3 APACHE20 LICENSE_COMB= multi LIB_DEPENDS= libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy \ libv8.so:lang/v8 \ # boost 1.52/1.55 from ports make mongod segfaulting with many tests # LIB_DEPENDS+= libboost_system.so:devel/boost-libs # MAKE_ARGS+= --use-system-boost # use bundled yaml # MAKE_ARGS+= --use-system-yaml # LIB_DEPENDS+= libyaml-cpp.so:devel/yaml-cpp ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than i386 and amd64" OPTIONS_DEFINE= SSL SASL TEST OPTIONS_DEFAULT=SSL TEST_DESC= Add support for running regression test USES= cpe execinfo scons MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} --cc=${CC} --cxx=${CXX} \ --use-system-pcre --use-system-snappy --use-system-v8 USERS= mongodb GROUPS= mongodb USE_RC_SUBR= mongod PORTSCOUT= limitw:1,even .include .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes MAKE_ARGS+= --ssl .endif .if ${PORT_OPTIONS:MSASL} MAKE_ARGS+= --use-sasl-client LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 .endif .if ${PORT_OPTIONS:MTEST} USES+= python:build BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.5:databases/pymongo TEST_TARGET= smokeAll smokeCppUnittests . if ${PORT_OPTIONS:MSSL} TEST_TARGET+= smokeSsl . endif .else ALL_TARGET= core tools .endif post-patch: @${REINPLACE_CMD} 's/\["-O3"\]/"${CXXFLAGS}"/' \ ${WRKSRC}/SConstruct .if ${PORT_OPTIONS:MTEST} test: build-depends build @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} .endif .include Index: head/databases/mongodb/distinfo =================================================================== --- head/databases/mongodb/distinfo (revision 414441) +++ head/databases/mongodb/distinfo (revision 414442) @@ -1,2 +1,2 @@ -SHA256 (mongodb-src-r2.6.7.tar.gz) = 512254d1adeaf19cc8188032ac75ce01ac114811b5a27ef3a95dc79eeedd6bc9 -SIZE (mongodb-src-r2.6.7.tar.gz) = 14540119 +SHA256 (mongodb-src-r2.6.12.tar.gz) = 2dd51eabcfcd133573be74c0131c85b67764042833e7d94077e86adc0b9406dc +SIZE (mongodb-src-r2.6.12.tar.gz) = 16462842 Index: head/databases/mongodb/files/patch-SConstruct =================================================================== --- head/databases/mongodb/files/patch-SConstruct (revision 414441) +++ head/databases/mongodb/files/patch-SConstruct (revision 414442) @@ -1,11 +1,26 @@ ---- SConstruct.orig 2014-05-05 02:29:43.000000000 +0000 -+++ SConstruct 2014-05-12 09:50:56.999470711 +0000 -@@ -843,7 +843,7 @@ +--- SConstruct.orig 2016-03-21 17:09:46.000000000 +0100 ++++ SConstruct 2016-05-02 12:45:18.685329078 +0200 +@@ -483,10 +483,10 @@ env = Environment( variables=env_vars, + ) + + # Report any unknown variables as an error. +-unknown_vars = env_vars.UnknownVariables() +-if unknown_vars: +- print "Unknown variables specified: {0}".format(", ".join(unknown_vars.keys())) +- Exit(1) ++#unknown_vars = env_vars.UnknownVariables() ++#if unknown_vars: ++# print "Unknown variables specified: {0}".format(", ".join(unknown_vars.keys())) ++# Exit(1) + + if has_option("cache"): + EnsureSConsVersion( 2, 3, 0 ) +@@ -867,7 +867,7 @@ if nix: env.Append( LIBS=[] ) #make scons colorgcc friendly - for key in ('HOME', 'TERM'): + for key in ('HOME', 'TERM', 'PATH', 'CCACHE_DIR'): try: env['ENV'][key] = os.environ[key] except KeyError: Index: head/databases/mongodb/files/patch-src_mongo_SConscript =================================================================== --- head/databases/mongodb/files/patch-src_mongo_SConscript (revision 414441) +++ head/databases/mongodb/files/patch-src_mongo_SConscript (revision 414442) @@ -1,20 +1,20 @@ ---- src/mongo/SConscript.orig 2013-03-22 20:55:25.000000000 +0100 -+++ src/mongo/SConscript 2013-03-25 17:46:04.000000000 +0100 +--- src/mongo/SConscript.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/mongo/SConscript 2016-05-02 12:44:35.405331527 +0200 @@ -13,7 +13,7 @@ Import("has_option") - Import("usesm usev8") - Import("installSetup") + Import("get_option") + Import("usev8") Import("enforce_glibc") -Import("darwin windows solaris linux nix") +Import("darwin windows solaris linux freebsd nix") env.SConscript(['base/SConscript', 'db/auth/SConscript', -@@ -765,7 +765,7 @@ def installBinary( e, name ): +@@ -1183,7 +1183,7 @@ def installBinary( e, name ): if enforce_glibc: e.AddPostAction( name, checkGlibc ) - if (solaris or linux) and (not has_option("nostrip")): + if (solaris or linux or freebsd) and (not has_option("nostrip")): name = e.Command('stripped/%s' % name, name, Copy('$TARGET', '$SOURCE'))[0] e.AddPostAction(name, 'strip $TARGET') Index: head/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp =================================================================== --- head/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp (revision 414441) +++ head/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp (revision 414442) @@ -1,11 +1,11 @@ ---- src/mongo/db/kill_current_op.cpp.orig 2014-05-15 15:30:33.100157820 +0000 -+++ src/mongo/db/kill_current_op.cpp 2014-05-15 15:35:12.714138934 +0000 -@@ -152,7 +152,7 @@ +--- src/mongo/db/kill_current_op.cpp.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/mongo/db/kill_current_op.cpp 2016-05-02 12:44:35.406331476 +0200 +@@ -152,7 +152,7 @@ namespace { } // Return true with (approx) probability p = "chance". Recall: 0 <= chance <= 1. - double next = static_cast(std::abs(checkForInterruptPRNG.nextInt64())); + double next = std::abs(static_cast(checkForInterruptPRNG.nextInt64())); double upperBound = std::numeric_limits::max() * failPointInfo["chance"].numberDouble(); if (next > upperBound) { Index: head/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp =================================================================== --- head/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp (revision 414441) +++ head/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp (revision 414442) @@ -1,11 +1,11 @@ ---- src/mongo/db/ops/modifier_push.cpp.orig 2014-05-15 15:24:21.650184430 +0000 -+++ src/mongo/db/ops/modifier_push.cpp 2014-05-15 15:25:51.014179801 +0000 -@@ -646,7 +646,7 @@ +--- src/mongo/db/ops/modifier_push.cpp.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/mongo/db/ops/modifier_push.cpp 2016-05-02 12:44:35.408331153 +0200 +@@ -646,7 +646,7 @@ namespace mongo { } const int64_t numChildren = mutablebson::countChildren(_preparedState->elemFound); - int64_t countRemoved = std::max(static_cast(0), numChildren - abs(_slice)); + int64_t countRemoved = std::max(static_cast(0), numChildren - (_slice >= 0 ? _slice : -_slice)); // If _slice is negative, remove from the bottom, otherwise from the top const bool removeFromEnd = (_slice > 0); Index: head/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp =================================================================== --- head/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp (revision 414441) +++ head/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp (revision 414442) @@ -1,29 +1,29 @@ ---- src/third_party/boost/libs/filesystem/v3/src/path.cpp.orig 2013-04-22 16:48:39.000000000 +0200 -+++ src/third_party/boost/libs/filesystem/v3/src/path.cpp 2013-05-03 14:46:44.000000000 +0200 +--- src/third_party/boost/libs/filesystem/v3/src/path.cpp.orig 2016-03-21 17:09:46.000000000 +0100 ++++ src/third_party/boost/libs/filesystem/v3/src/path.cpp 2016-05-02 12:44:35.410331831 +0200 @@ -35,7 +35,7 @@ #ifdef BOOST_WINDOWS_API # include "windows_file_codecvt.hpp" # include -#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__) # include #endif -@@ -766,7 +766,7 @@ +@@ -766,7 +766,7 @@ namespace codecvt_facet(&std::use_facet > (path_locale)); -#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__) // "All BSD system functions expect their string parameters to be in UTF-8 encoding // and nothing else." See -@@ -822,7 +822,7 @@ +@@ -822,7 +822,7 @@ namespace filesystem3 const path::codecvt_type*& path::wchar_t_codecvt_facet() { # if defined(BOOST_POSIX_API) && \ - !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) + !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__)) // A local static initialized by calling path::imbue ensures that std::locale(""), // which may throw, is called only if path_locale and condecvt_facet will actually // be used. Thus misconfigured environmental variables will only cause an