From b915a21821423232052e2e48ea14f288b3098c32 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 5 Sep 2012 00:02:31 +0000
Subject: Wed Sep  5 00:02:30 UTC 2012

---
 community/mongodb/PKGBUILD                | 20 ++++++++++++--------
 community/mongodb/SConscript.client.patch | 13 +++++++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 community/mongodb/SConscript.client.patch

(limited to 'community/mongodb')

diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index e0a629774..582dafd5b 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75451 2012-08-24 16:38:30Z heftig $
+# $Id: PKGBUILD 75855 2012-09-03 16:08:44Z tdziedzic $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Mathias Stearn <mathias@10gen.com>
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.0.7
+pkgver=2.2.0
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64')
@@ -19,22 +19,26 @@ backup=('etc/mongodb.conf')
 install="mongodb.install"
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
         'mongodb.rc' 'mongodb.conf' 'mongodb.service'
-        'boost-1.50.patch')
-md5sums=('420660f67c0dfaefac3ec3164fc2e096'
+        'SConscript.client.patch')
+md5sums=('832bdb6cc659176fd8d6b16a660ccfc6'
          '9c67e00f4626ad761a8f7d4e037a54d7'
          '4839fe1d638187ca3226e8267b947318'
          '96ab4517b48974ce0e566d9746a75a4f'
-         '5d22fd2c0ae869218488cd7c0dbc3903')
+         'a9529e2a6e392ffecef7a9178394c814')
 
 build() {
   export SCONSFLAGS="$MAKEFLAGS"
 
   cd mongodb-src-r${pkgver}
 
-  patch -Np1 -i $srcdir/boost-1.50.patch
+  # fix https://jira.mongodb.org/browse/SERVER-5575
+  patch -Np1 -i ${srcdir}/SConscript.client.patch
+
   sed -i '/nixLibPrefix/s/lib64/lib/' SConstruct
 
-  scons all --full --sharedclient # --use-system-sm --use-system-pcre
+  # --sharedclient generates an error that the source .so could not be found
+  # --use-system-sm --use-system-pcre
+  scons all --full
 }
 
 <<COMMENT
@@ -52,7 +56,7 @@ package() {
 
   cd mongodb-src-r${pkgver}
 
-  scons install --full --sharedclient --prefix=$pkgdir/usr # --use-system-sm --use-system-pcre
+  scons install --full --prefix=$pkgdir/usr
 
   install -D -m755 $srcdir/mongodb.rc $pkgdir/etc/rc.d/mongodb
   install -D -m644 $srcdir/mongodb.conf $pkgdir/etc/mongodb.conf
diff --git a/community/mongodb/SConscript.client.patch b/community/mongodb/SConscript.client.patch
new file mode 100644
index 000000000..f289d18da
--- /dev/null
+++ b/community/mongodb/SConscript.client.patch
@@ -0,0 +1,13 @@
+diff --git a/src/SConscript.client b/src/SConscript.client
+index 7a6bdc9..3fb55e5 100644
+--- a/src/SConscript.client
++++ b/src/SConscript.client
+@@ -134,7 +134,7 @@ env.Install(
+ # install
+ prefix = GetOption("prefix")
+ 
+-env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
++env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
+ 
+ for x in clientHeaderDirectories:
+     env.Install(prefix + "/include/mongo/" + x,
-- 
cgit v1.2.3-54-g00ecf