aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2016-05-02 12:40:53 +0000
committerAlex Dupre <ale@FreeBSD.org>2016-05-02 12:40:53 +0000
commitd158c01042a3004d7e611aff2da123fcd357c02d (patch)
tree6ef1d03a59ec891fa8c5ef0abb0b7323770e3ae0
parentaf372bced70fce050473e383f4768b456914639d (diff)
downloadports-d158c01042a3004d7e611aff2da123fcd357c02d.tar.gz
ports-d158c01042a3004d7e611aff2da123fcd357c02d.zip
Update to 2.6.12 release.
PR: 209150 Submitted by: demon
Notes
Notes: svn path=/head/; revision=414442
-rw-r--r--databases/mongodb/Makefile2
-rw-r--r--databases/mongodb/distinfo4
-rw-r--r--databases/mongodb/files/patch-SConstruct21
-rw-r--r--databases/mongodb/files/patch-src_mongo_SConscript10
-rw-r--r--databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp6
-rw-r--r--databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp6
-rw-r--r--databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp8
7 files changed, 36 insertions, 21 deletions
diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index 642b19019776..c72ca66e9ee6 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -2,7 +2,7 @@
# $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}
diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index d1dc1b6ed80a..bc6218e7724d 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -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
diff --git a/databases/mongodb/files/patch-SConstruct b/databases/mongodb/files/patch-SConstruct
index a12c2bb5460e..f29fde9fe5b6 100644
--- a/databases/mongodb/files/patch-SConstruct
+++ b/databases/mongodb/files/patch-SConstruct
@@ -1,6 +1,21 @@
---- 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
diff --git a/databases/mongodb/files/patch-src_mongo_SConscript b/databases/mongodb/files/patch-src_mongo_SConscript
index 2422e4665c09..a36550c63bc4 100644
--- a/databases/mongodb/files/patch-src_mongo_SConscript
+++ b/databases/mongodb/files/patch-src_mongo_SConscript
@@ -1,15 +1,15 @@
---- 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 )
diff --git a/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp b/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp
index 23061135c486..a3d6825fe62b 100644
--- a/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp
+++ b/databases/mongodb/files/patch-src_mongo_db_kill_current_op.cpp
@@ -1,6 +1,6 @@
---- 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.
diff --git a/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp b/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp
index e73b1c150156..d04f94bfb42e 100644
--- a/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp
+++ b/databases/mongodb/files/patch-src_mongo_db_ops_modifier_push.cpp
@@ -1,6 +1,6 @@
---- 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);
diff --git a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp b/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp
index 1e0784100346..87abf8dfd930 100644
--- a/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp
+++ b/databases/mongodb/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp
@@ -1,5 +1,5 @@
---- 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"
@@ -9,7 +9,7 @@
# include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
#endif
-@@ -766,7 +766,7 @@
+@@ -766,7 +766,7 @@ namespace
codecvt_facet(&std::use_facet<std::codecvt<wchar_t, char, std::mbstate_t> >
(path_locale));
@@ -18,7 +18,7 @@
// "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) && \