[104216] trunk/dports/databases/mongodb
ryandesign at macports.org
ryandesign at macports.org
Wed Mar 20 15:54:28 PDT 2013
Revision: 104216
https://trac.macports.org/changeset/104216
Author: ryandesign at macports.org
Date: 2013-03-20 15:54:28 -0700 (Wed, 20 Mar 2013)
Log Message:
-----------
mongodb: update to 2.4.0 (#38445) and now use v8 JavaScript engine instead of SpiderMonkey
Modified Paths:
--------------
trunk/dports/databases/mongodb/Portfile
trunk/dports/databases/mongodb/files/patch-SConstruct.diff
trunk/dports/databases/mongodb/files/patch-src-SConscript.client.diff
trunk/dports/databases/mongodb/files/patch-src-mongo-util-compress.cpp.diff
Removed Paths:
-------------
trunk/dports/databases/mongodb/files/patch-src-mongo-SConscript.diff
trunk/dports/databases/mongodb/files/patch-src-third_party-SConscript.diff
Modified: trunk/dports/databases/mongodb/Portfile
===================================================================
--- trunk/dports/databases/mongodb/Portfile 2013-03-20 22:13:17 UTC (rev 104215)
+++ trunk/dports/databases/mongodb/Portfile 2013-03-20 22:54:28 UTC (rev 104216)
@@ -6,7 +6,7 @@
name mongodb
epoch 1
-version 2.2.3
+version 2.4.0
license AGPL-3
categories databases
maintainers ryandesign
@@ -20,28 +20,25 @@
master_sites http://downloads.mongodb.org/src/
distname ${name}-src-r${version}
-checksums rmd160 43c021c3ea743eef83f355674a76b139c422efb1 \
- sha256 dd292c73f8182eb201ae4dd4bd7132c79c56247a7bc4fcde9d09a5bc6c74978d
+checksums rmd160 189d0225200443fb680b3662cdfb6b60446e5cfb \
+ sha256 81bcdc4c4dcc97b8384277de06c35f4d5be10079262b047954b72b3b04cfbc84
depends_build port:scons
-depends_lib port:pcre \
- port:spidermonkey \
- port:libpcap \
- port:snappy
+depends_lib port:libpcap \
+ port:pcre \
+ port:snappy \
+ port:v8
license_noconflict scons
-# As of mongodb 2.2.0, we use the bundled copy of boost instead of the boost port, because
-# the developers still have not fixed mongodb's incompatibility with boost 1.50 and up.
-# https://jira.mongodb.org/browse/SERVER-4314
+# As of mongodb 2.2.0, we use the bundled copy of boost to guard against
+# potential incompatible changes that might be made in the boost port.
patchfiles patch-SConstruct.diff \
patch-distsrc-client-SConstruct.diff \
patch-src-SConscript.client.diff \
- patch-src-mongo-SConscript.diff \
- patch-src-mongo-util-compress.cpp.diff \
- patch-src-third_party-SConscript.diff
+ patch-src-mongo-util-compress.cpp.diff
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
@@ -56,7 +53,7 @@
build.env TERM=xterm \
ARCHFLAGS="[get_canonical_archflags]" \
- CPPFLAGS="${configure.cppflags} -I${prefix}/include/js" \
+ CPPFLAGS="${configure.cppflags}" \
LDFLAGS="${configure.ldflags}"
build.cmd ${prefix}/bin/scons
@@ -65,9 +62,9 @@
--cxx=${configure.cxx} \
--full \
--use-system-pcre \
- --use-system-sm \
--use-system-snappy \
- --extralib=pcre,pcrecpp,js,snappy
+ --use-system-v8 \
+ --extralib=pcre,pcrecpp,snappy
eval destroot.env [option build.env]
destroot.args ${build.args}
Modified: trunk/dports/databases/mongodb/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-SConstruct.diff 2013-03-20 22:13:17 UTC (rev 104215)
+++ trunk/dports/databases/mongodb/files/patch-SConstruct.diff 2013-03-20 22:54:28 UTC (rev 104216)
@@ -1,11 +1,10 @@
---- SConstruct.orig 2012-08-28 00:28:11.000000000 -0500
-+++ SConstruct 2012-09-24 11:16:43.000000000 -0500
-@@ -486,21 +486,9 @@
+--- 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:
-- print( "YO" )
- if os.path.exists( "/usr/bin/g++-4.2" ):
- env["CXX"] = "g++-4.2"
-
Modified: trunk/dports/databases/mongodb/files/patch-src-SConscript.client.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-SConscript.client.diff 2013-03-20 22:13:17 UTC (rev 104215)
+++ trunk/dports/databases/mongodb/files/patch-src-SConscript.client.diff 2013-03-20 22:54:28 UTC (rev 104216)
@@ -1,7 +1,7 @@
https://jira.mongodb.org/browse/SERVER-5575
---- src/SConscript.client.orig 2012-08-28 00:28:11.000000000 -0500
-+++ src/SConscript.client 2012-09-24 08:02:47.000000000 -0500
-@@ -134,7 +134,7 @@
+--- src/SConscript.client.orig 2013-03-15 13:59:55.000000000 -0500
++++ src/SConscript.client 2013-03-20 03:41:50.000000000 -0500
+@@ -177,7 +177,7 @@
# install
prefix = GetOption("prefix")
@@ -9,4 +9,4 @@
+env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
for x in clientHeaderDirectories:
- env.Install(prefix + "/include/mongo/" + x,
+ inst = env.Install(prefix + "/include/mongo/" + x,
Deleted: trunk/dports/databases/mongodb/files/patch-src-mongo-SConscript.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-mongo-SConscript.diff 2013-03-20 22:13:17 UTC (rev 104215)
+++ trunk/dports/databases/mongodb/files/patch-src-mongo-SConscript.diff 2013-03-20 22:54:28 UTC (rev 104216)
@@ -1,11 +0,0 @@
---- src/mongo/SConscript.orig 2012-08-28 00:28:11.000000000 -0500
-+++ src/mongo/SConscript 2012-09-24 07:45:25.000000000 -0500
-@@ -170,7 +170,7 @@
-
- if usesm:
- env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_spidermonkey.cpp'],
-- LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator'])
-+ LIBDEPS=['$BUILD_DIR/third_party/shim_spidermonkey', 'bson_template_evaluator'])
- elif usev8:
- env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp',
- 'scripting/v8_db.cpp',
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 2013-03-20 22:13:17 UTC (rev 104215)
+++ trunk/dports/databases/mongodb/files/patch-src-mongo-util-compress.cpp.diff 2013-03-20 22:54:28 UTC (rev 104216)
@@ -1,6 +1,6 @@
---- src/mongo/util/compress.cpp.orig 2012-08-28 00:28:11.000000000 -0500
-+++ src/mongo/util/compress.cpp 2012-08-30 04:24:21.000000000 -0500
-@@ -2,7 +2,7 @@
+--- 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 @@
#include "mongo/util/compress.h"
Deleted: trunk/dports/databases/mongodb/files/patch-src-third_party-SConscript.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-third_party-SConscript.diff 2013-03-20 22:13:17 UTC (rev 104215)
+++ trunk/dports/databases/mongodb/files/patch-src-third_party-SConscript.diff 2013-03-20 22:54:28 UTC (rev 104216)
@@ -1,13 +0,0 @@
---- src/third_party/SConscript.orig 2012-08-28 00:28:11.000000000 -0500
-+++ src/third_party/SConscript 2012-09-24 08:00:44.000000000 -0500
-@@ -33,6 +33,10 @@
- env.StaticLibrary('shim_snappy', ['shim_snappy.cpp'], LIBDEPS=['snappy/snappy'])
-
- if use_system_version_of_library("sm"):
-+ if windows:
-+ env.Append(CPPDEFINES=['XP_WIN'])
-+ else:
-+ env.Append(CPPDEFINES=['XP_UNIX'])
- env.StaticLibrary("shim_spidermonkey", ['shim_spidermonkey.cpp'], SYSLIBDEPS=['js'])
- else:
- if windows:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130320/52514061/attachment.html>
More information about the macports-changes
mailing list