Changeset 53622


Ignore:
Timestamp:
Jul 10, 2009, 7:25:19 AM (10 years ago)
Author:
blb@…
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

Location:
trunk/dports/databases/mongodb
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/databases/mongodb/Portfile

    r53316 r53622  
    33PortSystem          1.0
    44name                mongodb
    5 version             0.9.5
     5version             0.9.6
    66categories          databases
    77maintainers         blb openmaintainer
     
    1414master_sites        http://github.com/mongodb/mongo/tarball/r${version}
    1515
    16 checksums           md5     796d401d6cc31d6d31cbe0e051780690 \
    17                     sha1    d73db4a5e160761a78503dec5f72ab4d73016f61 \
    18                     rmd160  2f1c12c4494d79299785bd201eb2792022ab765a
     16checksums           md5     fde6a2b636409269207520dcb106af60 \
     17                    sha1    cc3552724d3c5e4179dfbd3a509276a0acdc8617 \
     18                    rmd160  596295f9c572bfecad5fa03461a9aad21bb4742f
    1919
    20 set mongodb_version_hash   d4570964455bbd57c52f753fbe6a0a0828022991
     20set mongodb_version_hash   b57918b3a468ba5882f226fc54e00321c20d7f0d
    2121worksrcdir          ${name}-mongo-${mongodb_version_hash}
    2222
  • trunk/dports/databases/mongodb/files/patch-SConstruct.diff

    r53316 r53622  
    1 --- SConstruct.orig     2009-06-23 11:41:23.000000000 -0600
    2 +++ SConstruct  2009-07-02 19:55:42.000000000 -0600
    3 @@ -273,23 +273,16 @@
     1--- SConstruct.orig     2009-07-08 11:25:25.000000000 -0600
     2+++ SConstruct  2009-07-09 23:47:17.000000000 -0600
     3@@ -304,23 +304,16 @@
    44 
    55     env.Append( CPPPATH=[ "-I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/" ] )
     
    2222-        env.Append( CPPPATH=[ "/sw/include" , "/opt/local/include"] )
    2323-        env.Append( LIBPATH=["/sw/lib/", "/opt/local/lib"] )
    24 +    env.Append( CPPPATH=["@@PREFIX@@/include"] )
    25 +    env.Append( LIBPATH=["@@PREFIX@@/lib/"] )
     24+    env.Append( CPPPATH=["/mp/include"] )
     25+    env.Append( LIBPATH=["/mp/lib/"] )
    2626+    env["CC"] = os.environ["CC"]
    2727+    env["CPP"] = os.environ["CPP"]
     
    3030 elif "linux2" == os.sys.platform:
    3131     linux = True
    32 @@ -586,11 +579,7 @@
     32@@ -624,11 +617,7 @@
    3333         haveReadLine = False
    3434         if darwin:
     
    3939-            else:
    4040-                myenv.Append( LINKFLAGS=" /usr/lib/libreadline.dylib " )
    41 +            myenv.Append( LINKFLAGS=" @@PREFIX@@/lib/libreadline.dylib " )
     41+            myenv.Append( LINKFLAGS=" /mp/lib/libreadline.dylib " )
    4242         elif myCheckLib( "readline" , release and nix , staticOnly=release ):
    4343             myenv.Append( CPPDEFINES=[ "USE_READLINE" ] )
    44              myCheckLib( "tinfo" , staticOnly=release )
    45 @@ -757,8 +746,6 @@
     44             myCheckLib( "ncurses" , staticOnly=release )
     45@@ -714,7 +703,7 @@
     46 clientEnv = env.Clone();
     47 clientEnv.Append( CPPPATH=["../"] )
     48 clientEnv.Prepend( LIBS=[ "mongoclient"] )
     49-clientEnv.Append( LIBPATH=["."] )
     50+clientEnv.Prepend( LIBPATH=["."] )
     51 l = clientEnv[ "LIBS" ]
     52 removeIfInList( l , "pcre" )
     53 removeIfInList( l , "pcrecpp" )
     54@@ -722,7 +711,7 @@
     55 testEnv = env.Clone()
     56 testEnv.Append( CPPPATH=["../"] )
     57 testEnv.Prepend( LIBS=[ "mongotestfiles" , "unittest" ] )
     58-testEnv.Append( LIBPATH=["."] )
     59+testEnv.Prepend( LIBPATH=["."] )
     60 
     61 
     62 # ----- TARGETS ------
     63@@ -793,8 +782,6 @@
    4664         shellEnv["LINKFLAGS"].remove("-m64")
    4765         shellEnv["CPPPATH"].remove( "/usr/64/include" )
     
    5270     l = shellEnv["LIBS"]
    5371     if linux64:
     72@@ -816,7 +803,7 @@
     73 
     74         shellEnv.VariantDir( "32bit" , "." )
     75     else:
     76-        shellEnv.Append( LIBPATH=[ "." ] )
     77+        shellEnv.Prepend( LIBPATH=[ "." ] )
     78 
     79     shellEnv = doConfigure( shellEnv , needPcre=False , needJava=False , shell=True )
     80 
Note: See TracChangeset for help on using the changeset viewer.