[119143] trunk/dports/databases/mongodb
ryandesign at macports.org
ryandesign at macports.org
Thu Apr 17 22:07:30 PDT 2014
Revision: 119143
https://trac.macports.org/changeset/119143
Author: ryandesign at macports.org
Date: 2014-04-17 22:07:30 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
mongodb: update to 2.6.0 (#43338)
Modified Paths:
--------------
trunk/dports/databases/mongodb/Portfile
trunk/dports/databases/mongodb/files/patch-src-mongo-util-compress.cpp.diff
Removed Paths:
-------------
trunk/dports/databases/mongodb/files/patch-SConstruct.diff
trunk/dports/databases/mongodb/files/patch-distsrc-client-SConstruct.diff
trunk/dports/databases/mongodb/files/patch-libcpp.diff
trunk/dports/databases/mongodb/files/patch-src-mongo-db-fts-stemmer.cpp.diff
trunk/dports/databases/mongodb/files/patch-src-mongo-dbtests-documentsourcetests.cpp.diff
trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff
Modified: trunk/dports/databases/mongodb/Portfile
===================================================================
--- trunk/dports/databases/mongodb/Portfile 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/Portfile 2014-04-18 05:07:30 UTC (rev 119143)
@@ -8,7 +8,7 @@
name mongodb
epoch 1
-version 2.4.10
+version 2.6.0
license AGPL-3
categories databases
maintainers ryandesign
@@ -22,8 +22,8 @@
master_sites http://downloads.mongodb.org/src/
distname ${name}-src-r${version}
-checksums rmd160 7e689bc04d08254472247e10f21459c7bc822875 \
- sha256 8ac8d0537e5316e842e3713870b76ea3cc18ec1234307e850046449f48a87402
+checksums rmd160 b5cdda65c44b14443248b04b1ffe9c804b4248f6 \
+ sha256 6344d1f0cb44f171792c45ddc4f4b74a10ae86a28dc604b26ceab6dae4bdd318
depends_build port:scons
@@ -34,19 +34,8 @@
license_noconflict scons
-patchfiles patch-SConstruct.diff \
- patch-distsrc-client-SConstruct.diff \
- patch-libcpp.diff \
- patch-src-mongo-db-fts-stemmer.cpp.diff \
- patch-src-mongo-dbtests-documentsourcetests.cpp.diff \
- patch-src-mongo-util-compress.cpp.diff \
- patch-src-third_party-v8-SConscript.diff
+patchfiles patch-src-mongo-util-compress.cpp.diff
-post-patch {
- reinplace "s|@@PREFIX@@|${prefix}|g" \
- ${worksrcpath}/distsrc/client/SConstruct
-}
-
use_configure no
compiler.blacklist gcc-4.0 {clang < 318.0.45}
@@ -54,14 +43,15 @@
# TODO: fix me
conflicts_build v8
-build.env TERM=xterm \
- CPPFLAGS="${configure.cppflags}" \
- LDFLAGS="${configure.ldflags}"
+build.env TERM=xterm
build.cmd ${prefix}/bin/scons
build.target all mongobridge mongosniff
build.args --cc=${configure.cc} \
--cxx=${configure.cxx} \
+ --cpppath=${prefix}/include \
+ --libpath=${prefix}/lib \
+ --osx-version-min=${macosx_deployment_target} \
--full \
--use-system-boost \
--use-system-pcre \
@@ -108,8 +98,8 @@
depends_build
depends_lib
pre-fetch {
- ui_error "${name} ${version} requires OS X 10.6 or greater."
- return -code error "incompatible OS X version"
+ ui_error "${name} @${version} requires Mac OS X 10.6 or greater."
+ return -code error "incompatible Mac OS X version"
}
}
Deleted: trunk/dports/databases/mongodb/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-SConstruct.diff 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/files/patch-SConstruct.diff 2014-04-18 05:07:30 UTC (rev 119143)
@@ -1,24 +0,0 @@
---- SConstruct.orig 2013-03-15 13:59:55.000000000 -0500
-+++ SConstruct 2013-03-20 03:41:22.000000000 -0500
-@@ -491,20 +491,9 @@
- darwin = True
- platform = "osx" # prettier than darwin
-
-- if env["CXX"] is None:
-- if os.path.exists( "/usr/bin/g++-4.2" ):
-- env["CXX"] = "g++-4.2"
--
- nix = True
-
-- if force64:
-- env.Append( EXTRACPPPATH=["/usr/64/include"] )
-- env.Append( EXTRALIBPATH=["/usr/64/lib"] )
-- if installDir == DEFAULT_INSTALL_DIR:
-- installDir = "/usr/64/"
-- else:
-- env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
-- env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
-+ env.MergeFlags( [ os.getenv("CPPFLAGS"), os.getenv("LDFLAGS") ] )
-
- elif os.sys.platform.startswith("linux"):
- linux = True
Deleted: trunk/dports/databases/mongodb/files/patch-distsrc-client-SConstruct.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-distsrc-client-SConstruct.diff 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/files/patch-distsrc-client-SConstruct.diff 2014-04-18 05:07:30 UTC (rev 119143)
@@ -1,11 +0,0 @@
---- distsrc/client/SConstruct.orig 2012-08-28 00:28:11.000000000 -0500
-+++ distsrc/client/SConstruct 2012-08-30 04:21:53.000000000 -0500
-@@ -47,7 +47,7 @@
- win = False
-
- if "darwin" == sys.platform:
-- addExtraLibs( "/opt/local/" )
-+ addExtraLibs( "@@PREFIX@@/" )
- nix = True
- elif sys.platform in ("linux2", "linux3"):
- nix = True
Deleted: trunk/dports/databases/mongodb/files/patch-libcpp.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-libcpp.diff 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/files/patch-libcpp.diff 2014-04-18 05:07:30 UTC (rev 119143)
@@ -1,65 +0,0 @@
-https://github.com/mongodb/mongo/commit/c70a72b151fcfab26d0db5e8ceeb7c04a96ce449
---- src/mongo/platform/unordered_map.h.orig
-+++ src/mongo/platform/unordered_map.h
-@@ -15,10 +15,15 @@
-
- #pragma once
-
--// NOTE(acm): Before gcc-4.7, __cplusplus is always defined to be 1,
--// so we can't reliably detect C++11 support by exclusively checking
--// the value of __cplusplus.
--#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-+// We need to drag in a C++ header so we can examine __GXX_EXPERIMENTAL_CXX0X__ or
-+// _LIBCPP_VERSION meaningfully. The <new> header is pretty lightweight, mostly unavoidable,
-+// and almost certain to bring in the standard library configuration macros.
-+#include <new>
-+
-+// NOTE(acm): Before gcc-4.7, __cplusplus is always defined to be 1, so we can't reliably
-+// detect C++11 support by exclusively checking the value of __cplusplus. Additionaly, libc++,
-+// whether in C++11 or C++03 mode, doesn't use TR1 and drops things into std instead.
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_LIBCPP_VERSION)
-
- #include <unordered_map>
-
---- src/mongo/platform/unordered_set.h.orig
-+++ src/mongo/platform/unordered_set.h
-@@ -15,10 +15,15 @@
-
- #pragma once
-
--// NOTE(acm): Before gcc-4.7, __cplusplus is always defined to be 1,
--// so we can't reliably detect C++11 support by exclusively checking
--// the value of __cplusplus.
--#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
-+// We need to drag in a C++ header so we can examine __GXX_EXPERIMENTAL_CXX0X__ or
-+// _LIBCPP_VERSION meaningfully. The <new> header is pretty lightweight, mostly unavoidable,
-+// and almost certain to bring in the standard library configuration macros.
-+#include <new>
-+
-+// NOTE(acm): Before gcc-4.7, __cplusplus is always defined to be 1, so we can't reliably
-+// detect C++11 support by exclusively checking the value of __cplusplus. Additionaly, libc++,
-+// whether in C++11 or C++03 mode, doesn't use TR1 and drops things into std instead.
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_LIBCPP_VERSION)
-
- #include <unordered_set>
-
---- src/third_party/s2/hash.h.orig
-+++ src/third_party/s2/hash.h
-@@ -7,12 +7,12 @@
- #include "mongo/platform/unordered_set.h"
- #define hash_set mongo::unordered_set
-
--#if defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__
--#define HASH_NAMESPACE_START namespace std { namespace tr1 {
--#define HASH_NAMESPACE_END }}
--#elif defined OS_WINDOWS
-+#if (defined(OS_MACOSX) && defined(_LIBCPP_VERSION)) || defined(OS_WINDOWS)
- #define HASH_NAMESPACE_START namespace std {
- #define HASH_NAMESPACE_END }
-+#elif defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__
-+#define HASH_NAMESPACE_START namespace std { namespace tr1 {
-+#define HASH_NAMESPACE_END }}
- #endif
-
- // Places that hash-related functions are defined:
-
Deleted: trunk/dports/databases/mongodb/files/patch-src-mongo-db-fts-stemmer.cpp.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-mongo-db-fts-stemmer.cpp.diff 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/files/patch-src-mongo-db-fts-stemmer.cpp.diff 2014-04-18 05:07:30 UTC (rev 119143)
@@ -1,11 +0,0 @@
-https://github.com/mongodb/mongo/commit/bafd5c286f824ddcacc4376af1db35e5e8f11ea1
---- src/mongo/db/fts/stemmer.cpp.orig
-+++ src/mongo/db/fts/stemmer.cpp
-@@ -17,6 +17,7 @@
- */
-
- #include <string>
-+#include <cstdlib>
-
- #include "mongo/db/fts/stemmer.h"
-
Deleted: trunk/dports/databases/mongodb/files/patch-src-mongo-dbtests-documentsourcetests.cpp.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-mongo-dbtests-documentsourcetests.cpp.diff 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/files/patch-src-mongo-dbtests-documentsourcetests.cpp.diff 2014-04-18 05:07:30 UTC (rev 119143)
@@ -1,12 +0,0 @@
-https://github.com/mongodb/mongo/commit/a25c25b030cd2f35db1e0e0e9e32ca9efbc8a5f1
---- src/mongo/dbtests/documentsourcetests.cpp.orig
-+++ src/mongo/dbtests/documentsourcetests.cpp
-@@ -583,7 +583,7 @@
- };
-
- struct ValueCmp {
-- bool operator()(const Value& a, const Value& b) {
-+ bool operator()(const Value& a, const Value& b) const {
- return Value::compare( a, b ) < 0;
- }
- };
Modified: trunk/dports/databases/mongodb/files/patch-src-mongo-util-compress.cpp.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-mongo-util-compress.cpp.diff 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/files/patch-src-mongo-util-compress.cpp.diff 2014-04-18 05:07:30 UTC (rev 119143)
@@ -1,10 +1,10 @@
---- src/mongo/util/compress.cpp.orig 2013-03-15 13:59:55.000000000 -0500
-+++ src/mongo/util/compress.cpp 2013-03-20 03:48:23.000000000 -0500
-@@ -18,7 +18,7 @@
+--- src/mongo/util/compress.cpp.orig 2014-04-06 19:36:57.000000000 -0500
++++ src/mongo/util/compress.cpp 2014-04-10 02:23:52.000000000 -0500
+@@ -30,7 +30,7 @@
#include "mongo/util/compress.h"
--#include "third_party/snappy/snappy.h"
+-#include "snappy.h"
+#include <snappy.h>
namespace mongo {
Deleted: trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff 2014-04-18 04:44:18 UTC (rev 119142)
+++ trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff 2014-04-18 05:07:30 UTC (rev 119143)
@@ -1,10 +0,0 @@
---- src/third_party/v8/SConscript.orig 2013-03-15 13:59:55.000000000 -0500
-+++ src/third_party/v8/SConscript 2013-03-20 03:59:10.000000000 -0500
-@@ -47,7 +47,6 @@
- 'gcc': {
- 'all': {
- 'CCFLAGS': ['-Wall',
-- '-Werror',
- '-W',
- '-Wno-unused-parameter',
- '-Woverloaded-virtual',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140417/490dedb4/attachment-0001.html>
More information about the macports-changes
mailing list