[145963] trunk/dports/databases/mongodb

[ryandesign at macports.org]

Revision: 145963
          https://trac.macports.org/changeset/145963
Author:   ryandesign at macports.org
Date:     2016-02-22 22:50:50 -0800 (Mon, 22 Feb 2016)
Log Message:
-----------
mongodb: update to 3.2.3 (#50692)

Modified Paths:
--------------
    trunk/dports/databases/mongodb/Portfile

Removed Paths:
-------------
    trunk/dports/databases/mongodb/files/

Modified: trunk/dports/databases/mongodb/Portfile
===================================================================
--- trunk/dports/databases/mongodb/Portfile	2016-02-23 04:27:56 UTC (rev 145962)
+++ trunk/dports/databases/mongodb/Portfile	2016-02-23 06:50:50 UTC (rev 145963)
@@ -9,7 +9,7 @@
 
 name                mongodb
 epoch               1
-version             3.0.8
+version             3.2.3
 license             {AGPL-3 OpenSSLException}
 categories          databases
 maintainers         ryandesign
@@ -23,8 +23,8 @@
 master_sites        http://downloads.mongodb.org/src/
 distname            ${name}-src-r${version}
 
-checksums           rmd160  e28dab91f3aa7089d1cc6f40c7140878b14c1c3c \
-                    sha256  3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5
+checksums           rmd160  d67e7100b477c51a1317312d6fd938ccfeebed14 \
+                    sha256  82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa
 
 depends_build       port:scons
 
@@ -33,7 +33,18 @@
 
 license_noconflict  scons
 
-patchfiles-append   patch-src-mongo-util-compress.cpp.diff
+pre-extract {
+    if {${build_arch} eq "i386"} {
+        ui_error "Building ${subport} @${version} for ${build_arch} currently fails."
+        ui_error "See https://jira.mongodb.org/browse/SERVER-22810"
+        return -code error "incompatible architecture"
+    }
+    if {[variant_isset universal]} {
+        ui_error "Building ${subport} @${version} with the universal variant currently fails."
+        ui_error "See https://jira.mongodb.org/browse/SERVER-22810"
+        return -code error "incompatible architecture"
+    }
+}
 
 use_configure       no
 
@@ -49,36 +60,34 @@
 # TODO: fix me
 conflicts_build     libbson mongo-c-driver mongo-cxx-driver
 
-build.env           TERM=xterm
-
 build.cmd           ${prefix}/bin/scons
 build.target        all mongobridge mongosniff
-build.args          --cc=${configure.cc} \
-                    --cxx=${configure.cxx} \
-                    --c++11 \
-                    --cpppath=${prefix}/include \
+build.args          CC="${configure.cc}" \
+                    CPPPATH="${prefix}/include" \
+                    CXX="${configure.cxx}" \
+                    LIBPATH="${prefix}/lib" \
                     --disable-warnings-as-errors \
                     --libc++ \
-                    --libpath=${prefix}/lib \
                     --osx-version-min=${macosx_deployment_target} \
                     --ssl
 
 # Specify a short variant dir because the default variant dir is deeply nested
 # and can be very long, so long that on some systems the build will fail with
 # "Argument list too long"; see https://jira.mongodb.org/browse/SERVER-13829
-build.args-append   --variant-dir=MP
+build.args-append   VARIANT_DIR=MP
 
 supported_archs     i386 x86_64
-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
+lappend merger_build_args(x86_64) --wiredtiger=on
+lappend merger_build_args(i386) --wiredtiger=off
+foreach arch ${supported_archs} {
+    lappend merger_build_args(${arch}) CCFLAGS='-arch ${arch}' LINKFLAGS='-arch ${arch}' TARGET_ARCH=${arch}
+    lappend merger_destroot_args(${arch}) {*}$merger_build_args(${arch})
+}
 if {![variant_isset universal] && [info exists merger_build_args(${build_arch})]} {
-    build.args-append $merger_build_args(${build_arch})
+    build.args-append {*}$merger_build_args(${build_arch})
 }
 
-eval destroot.env   [option build.env]
-eval destroot.args  [option build.args]
+destroot.args       {*}${build.args}
 destroot.destdir    --prefix=${destroot}${prefix}
 
 set dbdir           ${prefix}/var/db/mongodb
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160222/87778970/attachment.html>