[110300] trunk/dports/databases/mongodb

[ryandesign at macports.org]

Revision: 110300
          https://trac.macports.org/changeset/110300
Author:   ryandesign at macports.org
Date:     2013-08-29 12:19:45 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
mongodb: use included v8 instead of MacPorts v8 (#40247)

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

Added Paths:
-----------
    trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff

Modified: trunk/dports/databases/mongodb/Portfile
===================================================================
--- trunk/dports/databases/mongodb/Portfile	2013-08-29 18:26:07 UTC (rev 110299)
+++ trunk/dports/databases/mongodb/Portfile	2013-08-29 19:19:45 UTC (rev 110300)
@@ -3,10 +3,13 @@
 
 PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
+PortGroup           conflicts_build 1.0
+PortGroup           muniversal 1.0
 
 name                mongodb
 epoch               1
 version             2.4.6
+revision            1
 license             AGPL-3
 categories          databases
 maintainers         ryandesign
@@ -28,14 +31,14 @@
 depends_lib         port:boost \
                     port:libpcap \
                     port:pcre \
-                    port:snappy \
-                    port:v8
+                    port:snappy
 
 license_noconflict  scons
 
 patchfiles          patch-SConstruct.diff \
                     patch-distsrc-client-SConstruct.diff \
-                    patch-src-mongo-util-compress.cpp.diff
+                    patch-src-mongo-util-compress.cpp.diff \
+                    patch-src-third_party-v8-SConscript.diff
 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" \
@@ -44,12 +47,12 @@
 
 use_configure       no
 
-variant universal {}
-
 compiler.blacklist  gcc-4.0 {clang < 318.0.45}
 
+# TODO: fix me
+conflicts_build     v8
+
 build.env           TERM=xterm \
-                    ARCHFLAGS="[get_canonical_archflags]" \
                     CPPFLAGS="${configure.cppflags}" \
                     LDFLAGS="${configure.ldflags}"
 
@@ -61,11 +64,22 @@
                     --use-system-boost \
                     --use-system-pcre \
                     --use-system-snappy \
-                    --use-system-v8 \
+                    --usev8 \
                     --extralib=pcre,pcrecpp,snappy
 
+supported_archs     i386 x86_64
+foreach arch ${configure.universal_archs} {
+    lappend merger_build_args(i386) --32
+    lappend merger_build_args(x86_64) --64
+    lappend merger_destroot_args(i386) --32
+    lappend merger_destroot_args(x86_64) --64
+}
+if {![variant_isset universal]} {
+    build.args-append $merger_build_args(${build_arch})
+}
+
 eval destroot.env   [option build.env]
-destroot.args       ${build.args}
+eval destroot.args  [option build.args]
 destroot.destdir    --prefix=${destroot}${prefix}
 
 set dbdir           ${prefix}/var/db/mongodb
@@ -74,6 +88,9 @@
 add_users           ${mongouser} group=${mongouser} realname=MongoDB\ Server
 
 post-destroot {
+    if {[variant_isset universal]} {
+        system -W ${worksrcpath} "lipo -create ${worksrcpath}-i386/mongobridge ${worksrcpath}-x86_64/mongobridge -output mongobridge"
+    }
     xinstall -W ${worksrcpath} mongobridge ${destroot}${prefix}/bin
 
     xinstall -m 755 -o ${mongouser} -g ${mongouser} -d \

Modified: trunk/dports/databases/mongodb/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-SConstruct.diff	2013-08-29 18:26:07 UTC (rev 110299)
+++ trunk/dports/databases/mongodb/files/patch-SConstruct.diff	2013-08-29 19:19:45 UTC (rev 110300)
@@ -18,7 +18,7 @@
 -    else:
 -       env.Append( EXTRACPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
 -       env.Append( EXTRALIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
-+    env.MergeFlags( [ os.getenv("CPPFLAGS"), os.getenv("LDFLAGS"), os.getenv("ARCHFLAGS") ] )
++    env.MergeFlags( [ os.getenv("CPPFLAGS"), os.getenv("LDFLAGS") ] )
  
  elif os.sys.platform.startswith("linux"):
      linux = True

Added: trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff
===================================================================
--- trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff	                        (rev 0)
+++ trunk/dports/databases/mongodb/files/patch-src-third_party-v8-SConscript.diff	2013-08-29 19:19:45 UTC (rev 110300)
@@ -0,0 +1,10 @@
+--- src/third_party/v8/SConscript.orig	2013-03-15 13:59:55.000000000 -0500
++++ src/third_party/v8/SConscript	2013-03-20 03:59:10.000000000 -0500
+@@ -47,7 +47,6 @@
+   'gcc': {
+     'all': {
+       'CCFLAGS':      ['-Wall',
+-                       '-Werror',
+                        '-W',
+                        '-Wno-unused-parameter',
+                        '-Woverloaded-virtual',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/bf6fed04/attachment.html>