Update to mongodb 2.0
OK?
f.-
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mongodb/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 18 Jul 2011 19:56:18 -0000 1.2
+++ Makefile 27 Sep 2011 21:54:37 -0000
@@ -2,10 +2,10 @@
COMMENT = scalable, high-performance document-oriented database
-DISTNAME = mongodb-src-r1.8.2
+DISTNAME = mongodb-src-r2.0.0
PKGNAME = ${DISTNAME:S/src-r//}
-SHARED_LIBS = mongoclient 0.0
+SHARED_LIBS = mongoclient 1.0
CATEGORIES = databases
@@ -19,25 +19,29 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = boost_filesystem-mt boost_program_options-mt boost_system-mt \
boost_thread-mt c execinfo mozjs m pcap pcre pcrecpp pthread \
- readline stdc++ termcap
+ stdc++
MASTER_SITES = http://downloads.mongodb.org/src/
MODULES = devel/scons
MODSCONS_FLAGS = --prefix="${PREFIX}" \
--cpppath="${LOCALBASE}/include/nspr" \
+ --extralib="mozjs,pcrecpp" \
--usesm \
--sharedclient \
--full
MAKE_ENV += HOME="${HOME}" \
TERM="${TERM}" \
- CXXFLAGS="$(CXXFLAGS) -DXULRUNNER" \
+ CXXFLAGS="$(CXXFLAGS) -DXULRUNNER -I${LOCALBASE}/include/js" \
LIBmongoclient_VERSION="${LIBmongoclient_VERSION}"
LIB_DEPENDS = devel/boost \
devel/libexecinfo \
devel/pcre \
lang/spidermonkey
+
+pre-configure:
+ rm -f ${WRKSRC}/third_party/{pcre,sm}.py
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mongodb
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mongodb/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jul 2011 19:56:18 -0000 1.2
+++ distinfo 27 Sep 2011 21:54:37 -0000
@@ -1,5 +1,5 @@
-MD5 (mongodb-src-r1.8.2.tar.gz) = lR+xp12Q/IIs9FKFhalwzw==
-RMD160 (mongodb-src-r1.8.2.tar.gz) = PB4z7Z/z3TxlMRKkbPF40HuT4yw=
-SHA1 (mongodb-src-r1.8.2.tar.gz) = 0hReW0pt8ulK7Ha+86k5nBHoVxo=
-SHA256 (mongodb-src-r1.8.2.tar.gz) =
HdN2sV4rcoinfaLhsMb/pdLGLNr0vM/ZqlHAdaHxv7g=
-SIZE (mongodb-src-r1.8.2.tar.gz) = 1722704
+MD5 (mongodb-src-r2.0.0.tar.gz) = UnY5hcE+BthbwSXH0+sD2Q==
+RMD160 (mongodb-src-r2.0.0.tar.gz) = y8JXK0eXE6spARxe0klfpn5Ox2A=
+SHA1 (mongodb-src-r2.0.0.tar.gz) = uTONiqFdAYHvF7XGfe9FIu8uhws=
+SHA256 (mongodb-src-r2.0.0.tar.gz) =
J1ZcuHgflc+K8soczCLoZFjaMBRCkOx91Y0U51UCILg=
+SIZE (mongodb-src-r2.0.0.tar.gz) = 2943167
Index: patches/patch-SConstruct
===================================================================
RCS file: /cvs/ports/databases/mongodb/patches/patch-SConstruct,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-SConstruct
--- patches/patch-SConstruct 2 Jun 2011 00:26:32 -0000 1.1.1.1
+++ patches/patch-SConstruct 27 Sep 2011 21:54:37 -0000
@@ -1,22 +1,24 @@
$OpenBSD: patch-SConstruct,v 1.1.1.1 2011/06/02 00:26:32 fgsch Exp $
---- SConstruct.orig Wed Apr 6 05:40:13 2011
-+++ SConstruct Sun Apr 10 22:48:00 2011
-@@ -668,12 +668,13 @@ if nix:
- if has_option( "distcc" ):
+--- SConstruct.orig Sun Sep 11 15:09:34 2011
++++ SConstruct Sun Sep 18 21:38:08 2011
+@@ -670,7 +670,7 @@ if nix:
env["CXX"] = "distcc " + env["CXX"]
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is
found in the search path but can't be used.
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall
-Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall
-Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux:
env.Append( CPPFLAGS=" -Werror " )
- env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is
faster than gcc's
+@@ -679,6 +679,7 @@ if nix:
+
+ env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
-+ env.Append( CXXFLAGS = os.environ['CXXFLAGS'] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
env.Append( LIBS=[] )
-@@ -685,10 +686,10 @@ if nix:
+@@ -690,10 +691,10 @@ if nix:
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
if debugBuild:
@@ -24,22 +26,13 @@ $OpenBSD: patch-SConstruct,v 1.1.1.1 201
+ env.Append( CPPFLAGS=" -O0 -fstack-protector -ggdb " );
env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
- else:
-- env.Append( CPPFLAGS=" -O3" )
+- env.Append( CPPFLAGS=" -O3 " )
+ #else:
-+ #env.Append( CPPFLAGS=" -O3" )
++ #env.Append( CPPFLAGS=" -O3 " )
#env.Append( CPPFLAGS=" -fprofile-generate" )
#env.Append( LINKFLAGS=" -fprofile-generate" )
# then:
-@@ -911,8 +912,6 @@ def doConfigure( myenv , needPcre=True , shell=False )
-
- myCheckLib( J , True )
- mozHeader = "js"
-- if bigLibString(myenv).find( "mozjs" ) >= 0:
-- mozHeader = "mozjs"
-
- if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
- if conf.CheckHeader( "jsapi.h" ):
-@@ -1118,7 +1117,7 @@ mongos = env.Program( "mongos" , commonFiles + coreDbF
+@@ -1096,7 +1097,7 @@ mongos = env.Program( "mongos" , commonFiles + coreDbF
# c++ library
clientLibName = str( env.Library( "mongoclient" , allClientFiles )[0] )
if has_option( "sharedclient" ):
@@ -48,7 +41,7 @@ $OpenBSD: patch-SConstruct,v 1.1.1.1 201
env.Library( "mongotestfiles" , commonFiles + coreDbFiles + coreServerFiles +
serverOnlyFiles + ["client/gridfs.cpp"])
env.Library( "mongoshellfiles" , allClientFiles + coreServerFiles )
-@@ -1473,7 +1472,7 @@ def installBinary( e , name ):
+@@ -1428,7 +1429,7 @@ def installBinary( e , name ):
fullInstallName = installDir + "/bin/" + name
allBinaries += [ name ]
Index: patches/patch-db_nonce_cpp
===================================================================
RCS file: /cvs/ports/databases/mongodb/patches/patch-db_nonce_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-db_nonce_cpp
--- patches/patch-db_nonce_cpp 2 Jun 2011 00:26:32 -0000 1.1.1.1
+++ patches/patch-db_nonce_cpp 27 Sep 2011 21:54:37 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-db_nonce_cpp,v 1.1.1.1 2011/06/02 00:26:32 fgsch Exp $
---- db/nonce.cpp.orig Sat Apr 2 04:01:52 2011
-+++ db/nonce.cpp Sat Apr 2 04:05:01 2011
-@@ -40,7 +40,7 @@ namespace mongo {
+--- db/nonce.cpp.orig Sun Sep 11 15:09:34 2011
++++ db/nonce.cpp Sun Sep 18 21:35:45 2011
+@@ -42,7 +42,7 @@ namespace mongo {
massert( 10353 , "can't open dev/urandom", _devrandom->is_open() );
#elif defined(_WIN32)
- srand(curTimeMicros());
+ srand(curTimeMicros()); // perhaps not relevant for rand_s but we
might want elsewhere anyway
-#else
+#elif !defined(__openbsd__)
srandomdev();
#endif
-@@ -70,6 +70,8 @@ namespace mongo {
+@@ -63,6 +63,8 @@ namespace mongo {
assert( rand_s(&a) == 0 );
assert( rand_s(&b) == 0 );
n = (((unsigned long long)a)<<32) | b;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/mongodb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 2 Jun 2011 00:26:32 -0000 1.1.1.1
+++ pkg/PLIST 27 Sep 2011 21:54:37 -0000
@@ -13,6 +13,7 @@
@bin bin/mongos
@bin bin/mongosniff
@bin bin/mongostat
+@bin bin/mongotop
include/mongo/
include/mongo/bson/
include/mongo/bson/bson-inl.h
@@ -49,10 +50,13 @@ include/mongo/client/undef_macros.h
include/mongo/db/
include/mongo/db/background.h
include/mongo/db/btree.h
+include/mongo/db/btreebuilder.h
include/mongo/db/client.h
include/mongo/db/clientcursor.h
+include/mongo/db/cloner.h
include/mongo/db/cmdline.h
include/mongo/db/commands.h
+include/mongo/db/compact.h
include/mongo/db/concurrency.h
include/mongo/db/curop-inl.h
include/mongo/db/curop.h
@@ -80,6 +84,7 @@ include/mongo/db/introspect.h
include/mongo/db/jsobj.h
include/mongo/db/jsobjmanipulator.h
include/mongo/db/json.h
+include/mongo/db/key.h
include/mongo/db/lasterror.h
include/mongo/db/matcher.h
include/mongo/db/minilex.h
@@ -91,10 +96,15 @@ include/mongo/db/namespace.h
include/mongo/db/nonce.h
include/mongo/db/oplog.h
include/mongo/db/oplogreader.h
+include/mongo/db/ops/
+include/mongo/db/ops/delete.h
+include/mongo/db/ops/query.h
+include/mongo/db/ops/update.h
include/mongo/db/pdfile.h
include/mongo/db/projection.h
-include/mongo/db/query.h
include/mongo/db/queryoptimizer.h
+include/mongo/db/querypattern.h
+include/mongo/db/queryutil-inl.h
include/mongo/db/queryutil.h
include/mongo/db/repl/
include/mongo/db/repl.h
@@ -107,12 +117,12 @@ include/mongo/db/repl/rs_exception.h
include/mongo/db/repl/rs_member.h
include/mongo/db/repl/rs_optime.h
include/mongo/db/repl_block.h
-include/mongo/db/replpair.h
+include/mongo/db/replutil.h
include/mongo/db/resource.h
include/mongo/db/restapi.h
include/mongo/db/scanandorder.h
include/mongo/db/security.h
-include/mongo/db/security_key.h
+include/mongo/db/security_common.h
include/mongo/db/stats/
include/mongo/db/stats/counters.h
include/mongo/db/stats/fine_clock.h
@@ -120,7 +130,6 @@ include/mongo/db/stats/service_stats.h
include/mongo/db/stats/snapshots.h
include/mongo/db/stats/top.h
include/mongo/db/taskqueue.h
-include/mongo/db/update.h
include/mongo/pch.h
include/mongo/s/
include/mongo/s/balance.h
@@ -133,6 +142,7 @@ include/mongo/s/d_chunk_manager.h
include/mongo/s/d_logic.h
include/mongo/s/d_writeback.h
include/mongo/s/grid.h
+include/mongo/s/mr_shard.h
include/mongo/s/request.h
include/mongo/s/server.h
include/mongo/s/shard.h
@@ -150,6 +160,7 @@ include/mongo/scripting/engine_v8.h
include/mongo/scripting/v8_db.h
include/mongo/scripting/v8_utils.h
include/mongo/scripting/v8_wrapper.h
+include/mongo/server.h
include/mongo/targetver.h
include/mongo/util/
include/mongo/util/admin_access.h
@@ -159,7 +170,10 @@ include/mongo/util/array.h
include/mongo/util/assert_util.h
include/mongo/util/background.h
include/mongo/util/base64.h
+include/mongo/util/bson_util.h
include/mongo/util/bufreader.h
+include/mongo/util/checksum.h
+include/mongo/util/compress.h
include/mongo/util/concurrency/
include/mongo/util/concurrency/list.h
include/mongo/util/concurrency/msg.h
@@ -182,16 +196,11 @@ include/mongo/util/hashtab.h
include/mongo/util/heapcheck.h
include/mongo/util/hex.h
include/mongo/util/histogram.h
-include/mongo/util/hostandport.h
-include/mongo/util/httpclient.h
include/mongo/util/log.h
include/mongo/util/logfile.h
include/mongo/util/lruishmap.h
include/mongo/util/md5.h
include/mongo/util/md5.hpp
-include/mongo/util/message.h
-include/mongo/util/message_server.h
-include/mongo/util/miniwebserver.h
include/mongo/util/mmap.h
include/mongo/util/mongoutils/
include/mongo/util/mongoutils/checksum.h
@@ -199,6 +208,15 @@ include/mongo/util/mongoutils/hash.h
include/mongo/util/mongoutils/html.h
include/mongo/util/mongoutils/str.h
include/mongo/util/moveablebuffer.h
+include/mongo/util/net/
+include/mongo/util/net/hostandport.h
+include/mongo/util/net/httpclient.h
+include/mongo/util/net/listen.h
+include/mongo/util/net/message.h
+include/mongo/util/net/message_port.h
+include/mongo/util/net/message_server.h
+include/mongo/util/net/miniwebserver.h
+include/mongo/util/net/sock.h
include/mongo/util/ntservice.h
include/mongo/util/optime.h
include/mongo/util/password.h
@@ -207,7 +225,6 @@ include/mongo/util/processinfo.h
include/mongo/util/queue.h
include/mongo/util/ramlog.h
include/mongo/util/signal_handlers.h
-include/mongo/util/sock.h
include/mongo/util/stringutils.h
include/mongo/util/text.h
include/mongo/util/time_support.h
