[53622] trunk/dports/databases/mongodb

[blb at macports.org]

Revision: 53622
          http://trac.macports.org/changeset/53622
Author:   blb at macports.org
Date:     2009-07-10 00:25:19 -0700 (Fri, 10 Jul 2009)
Log Message:
-----------
databases/mongodb - update to 0.9.6 (ticket #20252); prepend instead of append for LIBPATH so self-built libs are seen over already-installed during upgrades

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	2009-07-10 05:53:05 UTC (rev 53621)
+++ trunk/dports/databases/mongodb/Portfile	2009-07-10 07:25:19 UTC (rev 53622)
@@ -2,7 +2,7 @@
 
 PortSystem          1.0
 name                mongodb
-version             0.9.5
+version             0.9.6
 categories          databases
 maintainers         blb openmaintainer
 description         High-performance, schema-free document-oriented database
@@ -13,11 +13,11 @@
 homepage            http://www.mongodb.org/
 master_sites        http://github.com/mongodb/mongo/tarball/r${version}
 
-checksums           md5     796d401d6cc31d6d31cbe0e051780690 \
-                    sha1    d73db4a5e160761a78503dec5f72ab4d73016f61 \
-                    rmd160  2f1c12c4494d79299785bd201eb2792022ab765a
+checksums           md5     fde6a2b636409269207520dcb106af60 \
+                    sha1    cc3552724d3c5e4179dfbd3a509276a0acdc8617 \
+                    rmd160  596295f9c572bfecad5fa03461a9aad21bb4742f
 
-set mongodb_version_hash   d4570964455bbd57c52f753fbe6a0a0828022991
+set mongodb_version_hash   b57918b3a468ba5882f226fc54e00321c20d7f0d
 worksrcdir          ${name}-mongo-${mongodb_version_hash}
 
 depends_build       port:scons

Modified: trunk/dports/databases/mongodb/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-SConstruct.diff	2009-07-10 05:53:05 UTC (rev 53621)
+++ trunk/dports/databases/mongodb/files/patch-SConstruct.diff	2009-07-10 07:25:19 UTC (rev 53622)
@@ -1,6 +1,6 @@
---- SConstruct.orig	2009-06-23 11:41:23.000000000 -0600
-+++ SConstruct	2009-07-02 19:55:42.000000000 -0600
-@@ -273,23 +273,16 @@
+--- SConstruct.orig	2009-07-08 11:25:25.000000000 -0600
++++ SConstruct	2009-07-09 23:47:17.000000000 -0600
+@@ -304,23 +304,16 @@
  
      env.Append( CPPPATH=[ "-I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/" ] )
  
@@ -21,15 +21,15 @@
 -    else:
 -        env.Append( CPPPATH=[ "/sw/include" , "/opt/local/include"] )
 -        env.Append( LIBPATH=["/sw/lib/", "/opt/local/lib"] )
-+    env.Append( CPPPATH=["@@PREFIX@@/include"] )
-+    env.Append( LIBPATH=["@@PREFIX@@/lib/"] )
++    env.Append( CPPPATH=["/mp/include"] )
++    env.Append( LIBPATH=["/mp/lib/"] )
 +    env["CC"] = os.environ["CC"]
 +    env["CPP"] = os.environ["CPP"]
 +    env["CXX"] = os.environ["CXX"]
  
  elif "linux2" == os.sys.platform:
      linux = True
-@@ -586,11 +579,7 @@
+@@ -624,11 +617,7 @@
          haveReadLine = False
          if darwin:
              myenv.Append( CPPDEFINES=[ "USE_READLINE" ] )
@@ -38,11 +38,29 @@
 -                myCheckLib( "ncurses" , True )
 -            else:
 -                myenv.Append( LINKFLAGS=" /usr/lib/libreadline.dylib " )
-+            myenv.Append( LINKFLAGS=" @@PREFIX@@/lib/libreadline.dylib " )
++            myenv.Append( LINKFLAGS=" /mp/lib/libreadline.dylib " )
          elif myCheckLib( "readline" , release and nix , staticOnly=release ):
              myenv.Append( CPPDEFINES=[ "USE_READLINE" ] )
-             myCheckLib( "tinfo" , staticOnly=release )
-@@ -757,8 +746,6 @@
+             myCheckLib( "ncurses" , staticOnly=release )
+@@ -714,7 +703,7 @@
+ clientEnv = env.Clone();
+ clientEnv.Append( CPPPATH=["../"] )
+ clientEnv.Prepend( LIBS=[ "mongoclient"] )
+-clientEnv.Append( LIBPATH=["."] )
++clientEnv.Prepend( LIBPATH=["."] )
+ l = clientEnv[ "LIBS" ]
+ removeIfInList( l , "pcre" )
+ removeIfInList( l , "pcrecpp" )
+@@ -722,7 +711,7 @@
+ testEnv = env.Clone()
+ testEnv.Append( CPPPATH=["../"] )
+ testEnv.Prepend( LIBS=[ "mongotestfiles" , "unittest" ] )
+-testEnv.Append( LIBPATH=["."] )
++testEnv.Prepend( LIBPATH=["."] )
+ 
+ 
+ # ----- TARGETS ------
+@@ -793,8 +782,6 @@
          shellEnv["LINKFLAGS"].remove("-m64")
          shellEnv["CPPPATH"].remove( "/usr/64/include" )
          shellEnv["LIBPATH"].remove( "/usr/64/lib" )
@@ -51,3 +69,12 @@
  
      l = shellEnv["LIBS"]
      if linux64:
+@@ -816,7 +803,7 @@
+ 
+         shellEnv.VariantDir( "32bit" , "." )
+     else:
+-        shellEnv.Append( LIBPATH=[ "." ] )
++        shellEnv.Prepend( LIBPATH=[ "." ] )
+ 
+     shellEnv = doConfigure( shellEnv , needPcre=False , needJava=False , shell=True )
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090710/99fa1b48/attachment.html>