From a1dce9b885e623dbfdff305187b35691c52d109f Mon Sep 17 00:00:00 2001
From: fhajny <fhajny>
Date: Tue, 21 Apr 2015 07:59:39 +0000
Subject: Update mongo-c-driver to 1.1.4. Fix PLIST for the ssl option enabled.

- Fixed client pool concurrency issues
- Fixed some scenarios where replica sets would fail to reconnect on
  primary step down.
- Improved write concern handling
- Validate port number in URI
- Various other fixes
---
 databases/mongo-c-driver/Makefile | 6 +++---
 databases/mongo-c-driver/PLIST    | 7 ++++++-
 databases/mongo-c-driver/distinfo | 8 ++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'databases/mongo-c-driver')

diff --git a/databases/mongo-c-driver/Makefile b/databases/mongo-c-driver/Makefile
index c8bb1050a0b..0f210ac5dd3 100644
--- a/databases/mongo-c-driver/Makefile
+++ b/databases/mongo-c-driver/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2015/03/24 13:22:09 fhajny Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/21 07:59:39 fhajny Exp $
 
-DISTNAME=	mongo-c-driver-1.1.2
+DISTNAME=	mongo-c-driver-1.1.4
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/mongodb/mongo-c-driver/releases/download/${PKGVERSION_NOREV}/
 
@@ -28,6 +28,6 @@ CONFIGURE_ARGS+=		--enable-man-pages=yes
 PKGCONFIG_OVERRIDE+=	src/libmongoc-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	src/libmongoc-ssl-1.0.pc.in
 
-BUILDLINK_API_DEPENDS.libbson+=	libbson>=1.1.2
+BUILDLINK_API_DEPENDS.libbson+=	libbson>=1.1.4
 .include "../../devel/libbson/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mongo-c-driver/PLIST b/databases/mongo-c-driver/PLIST
index 2cbc1f2f239..466cb5dc4a0 100644
--- a/databases/mongo-c-driver/PLIST
+++ b/databases/mongo-c-driver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/03/24 13:22:09 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/04/21 07:59:39 fhajny Exp $
 bin/mongoc-stat
 include/libmongoc-1.0/mongoc-array-private.h
 include/libmongoc-1.0/mongoc-b64-private.h
@@ -45,18 +45,22 @@ include/libmongoc-1.0/mongoc-matcher-private.h
 include/libmongoc-1.0/mongoc-matcher.h
 include/libmongoc-1.0/mongoc-opcode.h
 include/libmongoc-1.0/mongoc-queue-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-rand-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-rand.h
 include/libmongoc-1.0/mongoc-read-prefs-private.h
 include/libmongoc-1.0/mongoc-read-prefs.h
 include/libmongoc-1.0/mongoc-rpc-private.h
 include/libmongoc-1.0/mongoc-sasl-private.h
 include/libmongoc-1.0/mongoc-scram-private.h
 include/libmongoc-1.0/mongoc-socket.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-ssl.h
 include/libmongoc-1.0/mongoc-ssl-private.h
 include/libmongoc-1.0/mongoc-stream-buffered.h
 include/libmongoc-1.0/mongoc-stream-file.h
 include/libmongoc-1.0/mongoc-stream-gridfs.h
 include/libmongoc-1.0/mongoc-stream-private.h
 include/libmongoc-1.0/mongoc-stream-socket.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls.h
 include/libmongoc-1.0/mongoc-stream.h
 include/libmongoc-1.0/mongoc-thread-private.h
 include/libmongoc-1.0/mongoc-trace.h
@@ -81,6 +85,7 @@ lib/libmongoc-1.0.la
 lib/libmongoc-priv.la
 lib/pkgconfig/libmongoc-1.0.pc
 lib/pkgconfig/libmongoc-priv.pc
+${PLIST.ssl}lib/pkgconfig/libmongoc-ssl-1.0.pc
 man/man3/mongoc_bulk_operation_delete.3
 man/man3/mongoc_bulk_operation_delete_one.3
 man/man3/mongoc_bulk_operation_destroy.3
diff --git a/databases/mongo-c-driver/distinfo b/databases/mongo-c-driver/distinfo
index db5ede0fdf0..09b32d8022d 100644
--- a/databases/mongo-c-driver/distinfo
+++ b/databases/mongo-c-driver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2015/03/24 13:22:09 fhajny Exp $
+$NetBSD: distinfo,v 1.7 2015/04/21 07:59:39 fhajny Exp $
 
-SHA1 (mongo-c-driver-1.1.2.tar.gz) = 8ca619ed9518db05d7f8a0d6458e6c36c90986be
-RMD160 (mongo-c-driver-1.1.2.tar.gz) = 50bd292e0a19de9a17f4cad0e90ff614c82674d9
-Size (mongo-c-driver-1.1.2.tar.gz) = 5443153 bytes
+SHA1 (mongo-c-driver-1.1.4.tar.gz) = 8f6037b95d1d6eaf62e83db5de0d14850f4c5343
+RMD160 (mongo-c-driver-1.1.4.tar.gz) = 5a7dca25080a9ebfe49d4c8f61e16073932d09ad
+Size (mongo-c-driver-1.1.4.tar.gz) = 5443691 bytes
-- 
cgit v1.2.3