[88634] trunk/dports/databases/mongodb

[ryandesign at macports.org]

Revision: 88634
          http://trac.macports.org/changeset/88634
Author:   ryandesign at macports.org
Date:     2012-01-05 21:49:42 -0800 (Thu, 05 Jan 2012)
Log Message:
-----------
mongodb: update to 2.0.2

Modified Paths:
--------------
    trunk/dports/databases/mongodb/Portfile
    trunk/dports/databases/mongodb/files/patch-SConstruct.diff

Modified: trunk/dports/databases/mongodb/Portfile
===================================================================
--- trunk/dports/databases/mongodb/Portfile	2012-01-06 02:58:53 UTC (rev 88633)
+++ trunk/dports/databases/mongodb/Portfile	2012-01-06 05:49:42 UTC (rev 88634)
@@ -4,7 +4,7 @@
 
 name                mongodb
 epoch               1
-version             2.0.1
+version             2.0.2
 license             AGPL-3.0
 categories          databases
 maintainers         ryandesign
@@ -18,30 +18,24 @@
 master_sites        http://downloads.mongodb.org/src/
 distname            ${name}-src-r${version}
 
-checksums           rmd160  e98af1398a9eb0ce0b5a6eae28dc93963cac4630 \
-                    sha256  4acbf4186b03fffabd6ea36f8312b173ea0f34b919833675b5f7330ef0470749
+checksums           rmd160  29a7052638236bffec5dff1d53bd5b870b8df3ef \
+                    sha256  e4a498c435532470e8aa7ea1d0119558e0f061c7574659e0ebc0e29cbee2ac8f
 
 depends_build       port:scons
 
 depends_lib         port:boost \
                     port:pcre \
                     port:spidermonkey \
-                    port:libpcap \
-                    port:snappy
+                    port:libpcap
 
+# https://jira.mongodb.org/browse/SERVER-4634
+#                    port:snappy
+
 patchfiles          patch-SConstruct.diff \
                     patch-distsrc-client-SConstruct.diff \
                     patch-util-compress.cpp.diff
 
 post-patch {
-    # Delete all included third-party libraries, except linenoise for which
-    # we don't have a port yet (there doesn't seem to be a stable release).
-    foreach x [glob ${worksrcpath}/third_party/*] {
-        if {"linenoise" != [file tail ${x}]} {
-            delete ${x}
-        }
-    }
-    
     reinplace "s|@@PREFIX@@|${prefix}|g" \
         ${worksrcpath}/SConstruct \
         ${worksrcpath}/distsrc/client/SConstruct
@@ -56,13 +50,17 @@
 }
 
 build.env           TERM=xterm \
-                    CFLAGS="[get_canonical_archflags]" \
-                    CPPFLAGS="-I${prefix}/include/js -DXP_UNIX" \
-                    CXXFLAGS="[get_canonical_archflags]" \
-                    LINKFLAGS="[get_canonical_archflags] -ljs -lpcre -lpcrecpp -lsnappy"
+                    CFLAGS="[get_canonical_archflags cc]" \
+                    CPPFLAGS="-I${prefix}/include/js" \
+                    CXXFLAGS="[get_canonical_archflags cxx]" \
+                    LINKFLAGS="[get_canonical_archflags ld] -lpcre"
+
 build.cmd           scons
-build.args          --usesm --cxx=${configure.cxx} --full
 build.target        all mongobridge mongosniff
+build.args          --cxx=${configure.cxx} \
+                    --full \
+                    --use-system-all \
+                    --usesm
 
 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	2012-01-06 02:58:53 UTC (rev 88633)
+++ trunk/dports/databases/mongodb/files/patch-SConstruct.diff	2012-01-06 05:49:42 UTC (rev 88634)
@@ -1,6 +1,6 @@
---- SConstruct.orig	2011-10-21 19:52:16.000000000 -0500
-+++ SConstruct	2011-10-27 20:35:05.000000000 -0500
-@@ -473,21 +473,15 @@
+--- SConstruct.orig	2011-12-14 11:18:48.000000000 -0600
++++ SConstruct	2012-01-05 20:50:06.000000000 -0600
+@@ -491,21 +491,15 @@
      darwin = True
      platform = "osx" # prettier than darwin
  
@@ -29,7 +29,7 @@
  
  elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
      linux = True
-@@ -670,7 +664,7 @@
+@@ -688,7 +682,7 @@
          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. 
@@ -38,30 +38,8 @@
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
      if linux:
          env.Append( CPPFLAGS=" -Werror " )
-@@ -757,21 +751,6 @@
-         keyfile = "jstests/libs/key%s" % keysuffix
-         os.chmod( keyfile , stat.S_IWUSR|stat.S_IRUSR )
+@@ -980,7 +974,7 @@
  
--for x in os.listdir( "third_party" ):
--    if not x.endswith( ".py" ) or x.find( "#" ) >= 0:
--        continue
--         
--    shortName = x.rpartition( "." )[0]
--    path = "third_party/%s" % x
--
--
--    myModule = imp.load_module( "third_party_%s" % shortName , open( path , "r" ) , path , ( ".py" , "r" , imp.PY_SOURCE ) )
--    fileLists = { "commonFiles" : commonFiles , "serverOnlyFiles" : serverOnlyFiles , "scriptingFiles" : scriptingFiles }
--    
--    options_topass["windows"] = windows
--    options_topass["nix"] = nix
--    
--    myModule.configure( env , fileLists , options_topass )
- 
- coreServerFiles += scriptingFiles
- 
-@@ -963,7 +942,7 @@
- 
          myCheckLib( "tcmalloc" , True );  # if successful, appedded 'tcmalloc' to myenv[ LIBS ]
          myenv.Append( CPPDEFINES=[ "HEAP_CHECKING" ] )
 -        myenv.Append( CPPFLAGS="-fno-omit-frame-pointer" )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120105/4349283a/attachment-0001.html>