Ticket #31159: mongodb-2.0.0.diff

File mongodb-2.0.0.diff, 4.9 KB (added by ryandesign (Ryan Carsten Schmidt), 13 years ago)

patch that does not work

  • files/lion.patch

     
    1 --- util/processinfo_darwin.cpp.orig
    2 +++ util/processinfo_darwin.cpp
    3 @@ -19,7 +19,7 @@
    4  #include "processinfo.h"
    5  #include "log.h"
    6  
    7 -
    8 +#include <mach/vm_statistics.h>
    9  #include <mach/task_info.h>
    10  
    11  #include <mach/mach_init.h>
    12 @@ -27,7 +27,7 @@
    13  #include <mach/mach_traps.h>
    14  #include <mach/task.h>
    15  #include <mach/vm_map.h>
    16 -#include <mach/shared_memory_server.h>
    17 +#include <mach/shared_region.h>
    18  #include <iostream>
    19  
    20  #include <sys/types.h>

  • files/patch-distsrc-client-SConstruct.diff

     
     1--- distsrc/client/SConstruct.orig      2011-09-11 09:09:34.000000000 -0500
     2+++ distsrc/client/SConstruct   2011-09-13 03:50:05.000000000 -0500
     3@@ -39,7 +39,7 @@
     4 linux = False
     5 
     6 if "darwin" == os.sys.platform:
     7-    addExtraLibs( "/opt/local/" )
     8+    addExtraLibs( "@@PREFIX@@/" )
     9     nix = True
     10 elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
     11     nix = True

  • files/patch-SConstruct.diff

     
    1 --- SConstruct.orig     2011-03-16 10:33:30.000000000 -0500
    2 +++ SConstruct  2011-03-27 03:30:06.000000000 -0500
    3 @@ -447,21 +447,14 @@
     1--- SConstruct.orig     2011-09-11 09:09:34.000000000 -0500
     2+++ SConstruct  2011-09-13 03:46:23.000000000 -0500
     3@@ -473,21 +473,14 @@
    44     darwin = True
    55     platform = "osx" # prettier than darwin
    66 
    … …  
    2020-        env.Append( CPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
    2121-        env.Append( LIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
    2222+    env.Append( CPPPATH=["@@PREFIX@@/include"] )
    23 +    env.Append( LIBPATH=["@@PREFIX@@/lib/"] )
     23+    env.Append( LIBPATH=["@@PREFIX@@/lib"] )
    2424+    env["CFLAGS"] = os.getenv("CFLAGS")
    2525+    env["CXXFLAGS"] = os.getenv("CXXFLAGS")
    2626+    env["LINKFLAGS"] = os.getenv("LINKFLAGS")
    2727+
    2828 
    29  elif "linux2" == os.sys.platform:
     29 elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
    3030     linux = True
    31 @@ -931,11 +924,7 @@
    32          haveReadLine = False
    33          if darwin:
    34              myenv.Append( CPPDEFINES=[ "USE_READLINE" ] )
    35 -            if force64:
    36 -                myCheckLib( "readline" , True )
    37 -                myCheckLib( "ncurses" , True )
    38 -            else:
    39 -                myenv.Append( LINKFLAGS=" /usr/lib/libreadline.dylib " )
    40 +            myenv.Append( LINKFLAGS=" @@PREFIX@@/lib/libreadline.dylib " )
    41          elif openbsd:
    42              myenv.Append( CPPDEFINES=[ "USE_READLINE" ] )
    43              myCheckLib( "termcap" , True )
    44 @@ -1176,8 +1165,6 @@
    45          shellEnv["LINKFLAGS"].remove("-m64")
    46          shellEnv["CPPPATH"].remove( "/usr/64/include" )
    47          shellEnv["LIBPATH"].remove( "/usr/64/lib" )
    48 -        shellEnv.Append( CPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
    49 -        shellEnv.Append( LIBPATH=filterExists(["/sw/lib/", "/opt/local/lib" , "/usr/lib", "/usr/local/lib" ]) )
    50  
    51      l = shellEnv["LIBS"]
    52  

  • Portfile

     
    55
    66name                mongodb
    77epoch               1
    8 version             1.8.3
     8version             2.0.0
    99license             AGPL-3.0
    1010categories          databases
    1111maintainers         nomaintainer
    … …  
    1919master_sites        http://downloads.mongodb.org/src/
    2020distname            ${name}-src-r${version}
    2121
    22 checksums           rmd160  9662b6963e7e6a4b5adcbea3faa36dd50a794457 \
    23                     sha256  ee121c9698a48b819f1c5b5ba10a98d565bd732d527743f1475f54f697dd63e2
     22checksums           rmd160  cbc2572b479713ab29011c5ed2495fa67e4ec760 \
     23                    sha256  27565cb8781f95cf8af2ca1ccc22e86458da30144290ec7dd58d14e7550220b8
    2424
    2525depends_build       port:scons
    2626
    … …  
    3636                    lib/libreadline.dylib \
    3737                    lib/libjs.dylib
    3838
    39 patchfiles          patch-SConstruct.diff
     39patchfiles          patch-SConstruct.diff \
     40                    patch-distsrc-client-SConstruct.diff
    4041
    4142post-patch {
    42     reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/SConstruct
     43    reinplace "s|@@PREFIX@@|${prefix}|g" \
     44        ${worksrcpath}/SConstruct \
     45        ${worksrcpath}/distsrc/client/SConstruct
    4346}
    4447
    4548use_configure       no
    … …  
    6265    xinstall -W ${worksrcpath} mongobridge ${destroot}${prefix}/bin
    6366}
    6467
    65 platform darwin 11 {
    66     patchfiles-append lion.patch
    67 }
    68 
    6968livecheck.url       ${homepage}downloads
    7069livecheck.regex     {mongodb-src-r(\d+\.\d*[02468]\.\d+)\.}