4 files changed, 62 insertions, 24 deletions

diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index bdad053e7f1e..836c615a4400 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mongodb
-PORTVERSION=	1.8.3
+PORTVERSION=	2.0.2
 CATEGORIES=	databases net
 MASTER_SITES=	http://downloads.mongodb.org/src/
 DISTNAME=	${PORTNAME}-src-r${PORTVERSION}
@@ -15,19 +15,20 @@ MAINTAINER=	mail@derzinn.de
 COMMENT=	A NOSQL distributed document-oriented database
 
 LIB_DEPENDS=	boost_system:${PORTSDIR}/devel/boost-libs \
-		js:${PORTSDIR}/lang/spidermonkey \
-		pcre:${PORTSDIR}/devel/pcre \
+		execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		nspr4:${PORTSDIR}/devel/nspr \
-		execinfo.1:${PORTSDIR}/devel/libexecinfo
+		pcre:${PORTSDIR}/devel/pcre \
+		snappy:${PORTSDIR}/archivers/snappy
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
 
-OPTIONS=	DEVEL "Install development files (library and headers)" off
+OPTIONS=	DEVEL "Install development files (library and headers)" off \
+		V8 "Use v8 instead of spider monkey for javascript" off
 
 USE_SCONS=	yes
 SCONS_TARGET=	all
-SCONS_ARGS=	--prefix=${PREFIX} --cxx=${CXX} --cpp=${CPP}
+SCONS_ARGS=	--prefix=${PREFIX} --cxx=${CXX} --cpp=${CPP} --use-system-all
 
 USERS=	mongodb
 GROUPS=	mongodb
@@ -43,6 +44,14 @@ PLIST_SUB+=	DEVEL=""
 PLIST_SUB+=	DEVEL="@comment "
 .endif
 
+.if defined(WITH_V8)
+SCONS_ARGS+=	--usev8
+LIB_DEPENDS+=	v8:${PORTSDIR}/lang/v8
+.else
+SCONS_ARGS+=	--usesm
+LIB_DEPENDS+=	js:${PORTSDIR}/lang/spidermonkey
+.endif
+
 post-install:
 	@if [ ! -f ${PREFIX}/etc/mongodb.conf ]; then \
 		${TOUCH} ${PREFIX}/etc/mongodb.conf ; \
diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index b8ae781c275b..894477e57df5 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mongodb-src-r1.8.3.tar.gz) = ee121c9698a48b819f1c5b5ba10a98d565bd732d527743f1475f54f697dd63e2
-SIZE (mongodb-src-r1.8.3.tar.gz) = 1726144
+SHA256 (mongodb-src-r2.0.2.tar.gz) = e4a498c435532470e8aa7ea1d0119558e0f061c7574659e0ebc0e29cbee2ac8f
+SIZE (mongodb-src-r2.0.2.tar.gz) = 2956087
diff --git a/databases/mongodb/files/patch-SConstruct b/databases/mongodb/files/patch-SConstruct
index 4c2bea1cf11e..467418ea8637 100644
--- a/databases/mongodb/files/patch-SConstruct
+++ b/databases/mongodb/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2011-04-06 04:40:13.000000000 +0000
-+++ SConstruct	2011-10-04 19:16:33.000000000 +0000
-@@ -679,7 +679,10 @@
+--- SConstruct.orig	2011-12-16 18:02:27.000000000 +0100
++++ SConstruct	2011-12-17 04:39:19.000000000 +0100
+@@ -702,7 +702,10 @@
  
      #make scons colorgcc friendly
      env['ENV']['HOME'] = os.environ['HOME']
@@ -12,7 +12,19 @@
  
      if linux and has_option( "sharedclient" ):
          env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
-@@ -1473,7 +1476,7 @@
+@@ -785,8 +788,9 @@
+     options_topass["nix"] = nix
+     
+     if has_option( "use-system-" + shortName ) or has_option( "use-system-all" ):
+-        print( "using system version of: " + shortName )
+-        myModule.configureSystem( env , fileLists , options_topass )
++        if not (shortName == 'sm' and usev8):
++            print( "using system version of: " + shortName )
++            myModule.configureSystem( env , fileLists , options_topass )
+     else:
+         myModule.configure( env , fileLists , options_topass )
+ 
+@@ -1446,7 +1450,7 @@
      fullInstallName = installDir + "/bin/" + name
  
      allBinaries += [ name ]
@@ -20,4 +32,4 @@
 +    if (solaris or linux or freebsd) and (not has_option("nostrip")):
          e.AddPostAction( inst, e.Action( 'strip ' + fullInstallName ) )
  
-     if linux and len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "s3dist":
+     if not has_option( "no-glibc-check" ) and linux and len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "s3dist":
diff --git a/databases/mongodb/pkg-plist b/databases/mongodb/pkg-plist
index acb32fb1aebb..515a27faf5b5 100644
--- a/databases/mongodb/pkg-plist
+++ b/databases/mongodb/pkg-plist
@@ -11,6 +11,7 @@ bin/mongorestore
 bin/mongos
 bin/mongosniff
 bin/mongostat
+bin/mongotop
 %%DEVEL%%lib/libmongoclient.a
 %%DEVEL%%include/mongo/bson/bson-inl.h
 %%DEVEL%%include/mongo/bson/bson.h
@@ -43,10 +44,13 @@ bin/mongostat
 %%DEVEL%%include/mongo/client/undef_macros.h
 %%DEVEL%%include/mongo/db/background.h
 %%DEVEL%%include/mongo/db/btree.h
+%%DEVEL%%include/mongo/db/btreebuilder.h
 %%DEVEL%%include/mongo/db/client.h
 %%DEVEL%%include/mongo/db/clientcursor.h
+%%DEVEL%%include/mongo/db/cloner.h
 %%DEVEL%%include/mongo/db/cmdline.h
 %%DEVEL%%include/mongo/db/commands.h
+%%DEVEL%%include/mongo/db/compact.h
 %%DEVEL%%include/mongo/db/concurrency.h
 %%DEVEL%%include/mongo/db/curop-inl.h
 %%DEVEL%%include/mongo/db/curop.h
@@ -74,6 +78,7 @@ bin/mongostat
 %%DEVEL%%include/mongo/db/jsobj.h
 %%DEVEL%%include/mongo/db/jsobjmanipulator.h
 %%DEVEL%%include/mongo/db/json.h
+%%DEVEL%%include/mongo/db/key.h
 %%DEVEL%%include/mongo/db/lasterror.h
 %%DEVEL%%include/mongo/db/matcher.h
 %%DEVEL%%include/mongo/db/minilex.h
@@ -85,10 +90,14 @@ bin/mongostat
 %%DEVEL%%include/mongo/db/nonce.h
 %%DEVEL%%include/mongo/db/oplog.h
 %%DEVEL%%include/mongo/db/oplogreader.h
+%%DEVEL%%include/mongo/db/ops/delete.h
+%%DEVEL%%include/mongo/db/ops/query.h
+%%DEVEL%%include/mongo/db/ops/update.h
 %%DEVEL%%include/mongo/db/pdfile.h
 %%DEVEL%%include/mongo/db/projection.h
-%%DEVEL%%include/mongo/db/query.h
 %%DEVEL%%include/mongo/db/queryoptimizer.h
+%%DEVEL%%include/mongo/db/querypattern.h
+%%DEVEL%%include/mongo/db/queryutil-inl.h
 %%DEVEL%%include/mongo/db/queryutil.h
 %%DEVEL%%include/mongo/db/repl/connections.h
 %%DEVEL%%include/mongo/db/repl/health.h
@@ -100,19 +109,18 @@ bin/mongostat
 %%DEVEL%%include/mongo/db/repl/rs_optime.h
 %%DEVEL%%include/mongo/db/repl.h
 %%DEVEL%%include/mongo/db/repl_block.h
-%%DEVEL%%include/mongo/db/replpair.h
+%%DEVEL%%include/mongo/db/replutil.h
 %%DEVEL%%include/mongo/db/resource.h
 %%DEVEL%%include/mongo/db/restapi.h
 %%DEVEL%%include/mongo/db/scanandorder.h
 %%DEVEL%%include/mongo/db/security.h
-%%DEVEL%%include/mongo/db/security_key.h
+%%DEVEL%%include/mongo/db/security_common.h
 %%DEVEL%%include/mongo/db/stats/counters.h
 %%DEVEL%%include/mongo/db/stats/fine_clock.h
 %%DEVEL%%include/mongo/db/stats/service_stats.h
 %%DEVEL%%include/mongo/db/stats/snapshots.h
 %%DEVEL%%include/mongo/db/stats/top.h
 %%DEVEL%%include/mongo/db/taskqueue.h
-%%DEVEL%%include/mongo/db/update.h
 %%DEVEL%%include/mongo/pch.h
 %%DEVEL%%include/mongo/s/balance.h
 %%DEVEL%%include/mongo/s/balancer_policy.h
@@ -124,6 +132,7 @@ bin/mongostat
 %%DEVEL%%include/mongo/s/d_logic.h
 %%DEVEL%%include/mongo/s/d_writeback.h
 %%DEVEL%%include/mongo/s/grid.h
+%%DEVEL%%include/mongo/s/mr_shard.h
 %%DEVEL%%include/mongo/s/request.h
 %%DEVEL%%include/mongo/s/server.h
 %%DEVEL%%include/mongo/s/shard.h
@@ -140,6 +149,7 @@ bin/mongostat
 %%DEVEL%%include/mongo/scripting/v8_db.h
 %%DEVEL%%include/mongo/scripting/v8_utils.h
 %%DEVEL%%include/mongo/scripting/v8_wrapper.h
+%%DEVEL%%include/mongo/server.h
 %%DEVEL%%include/mongo/targetver.h
 %%DEVEL%%include/mongo/util/admin_access.h
 %%DEVEL%%include/mongo/util/alignedbuilder.h
@@ -148,7 +158,10 @@ bin/mongostat
 %%DEVEL%%include/mongo/util/assert_util.h
 %%DEVEL%%include/mongo/util/background.h
 %%DEVEL%%include/mongo/util/base64.h
+%%DEVEL%%include/mongo/util/bson_util.h
 %%DEVEL%%include/mongo/util/bufreader.h
+%%DEVEL%%include/mongo/util/checksum.h
+%%DEVEL%%include/mongo/util/compress.h
 %%DEVEL%%include/mongo/util/concurrency/list.h
 %%DEVEL%%include/mongo/util/concurrency/msg.h
 %%DEVEL%%include/mongo/util/concurrency/mutex.h
@@ -170,22 +183,25 @@ bin/mongostat
 %%DEVEL%%include/mongo/util/heapcheck.h
 %%DEVEL%%include/mongo/util/hex.h
 %%DEVEL%%include/mongo/util/histogram.h
-%%DEVEL%%include/mongo/util/hostandport.h
-%%DEVEL%%include/mongo/util/httpclient.h
 %%DEVEL%%include/mongo/util/log.h
 %%DEVEL%%include/mongo/util/logfile.h
-%%DEVEL%%include/mongo/util/md5.h
 %%DEVEL%%include/mongo/util/lruishmap.h
+%%DEVEL%%include/mongo/util/md5.h
 %%DEVEL%%include/mongo/util/md5.hpp
-%%DEVEL%%include/mongo/util/message.h
-%%DEVEL%%include/mongo/util/message_server.h
-%%DEVEL%%include/mongo/util/miniwebserver.h
 %%DEVEL%%include/mongo/util/mmap.h
 %%DEVEL%%include/mongo/util/mongoutils/checksum.h
 %%DEVEL%%include/mongo/util/mongoutils/hash.h
 %%DEVEL%%include/mongo/util/mongoutils/html.h
 %%DEVEL%%include/mongo/util/mongoutils/str.h
 %%DEVEL%%include/mongo/util/moveablebuffer.h
+%%DEVEL%%include/mongo/util/net/hostandport.h
+%%DEVEL%%include/mongo/util/net/httpclient.h
+%%DEVEL%%include/mongo/util/net/listen.h
+%%DEVEL%%include/mongo/util/net/message.h
+%%DEVEL%%include/mongo/util/net/message_port.h
+%%DEVEL%%include/mongo/util/net/message_server.h
+%%DEVEL%%include/mongo/util/net/miniwebserver.h
+%%DEVEL%%include/mongo/util/net/sock.h
 %%DEVEL%%include/mongo/util/ntservice.h
 %%DEVEL%%include/mongo/util/optime.h
 %%DEVEL%%include/mongo/util/password.h
@@ -194,7 +210,6 @@ bin/mongostat
 %%DEVEL%%include/mongo/util/queue.h
 %%DEVEL%%include/mongo/util/ramlog.h
 %%DEVEL%%include/mongo/util/signal_handlers.h
-%%DEVEL%%include/mongo/util/sock.h
 %%DEVEL%%include/mongo/util/stringutils.h
 %%DEVEL%%include/mongo/util/text.h
 %%DEVEL%%include/mongo/util/time_support.h
@@ -205,6 +220,7 @@ bin/mongostat
 %%DEVEL%%@dirrm include/mongo/bson/util
 %%DEVEL%%@dirrm include/mongo/bson
 %%DEVEL%%@dirrm include/mongo/client
+%%DEVEL%%@dirrm include/mongo/db/ops
 %%DEVEL%%@dirrm include/mongo/db/repl
 %%DEVEL%%@dirrm include/mongo/db/stats
 %%DEVEL%%@dirrm include/mongo/db
@@ -212,5 +228,6 @@ bin/mongostat
 %%DEVEL%%@dirrm include/mongo/scripting
 %%DEVEL%%@dirrm include/mongo/util/concurrency
 %%DEVEL%%@dirrm include/mongo/util/mongoutils
+%%DEVEL%%@dirrm include/mongo/util/net
 %%DEVEL%%@dirrm include/mongo/util
 %%DEVEL%%@dirrm include/mongo