svn commit: r452887 - in head/devel/mongo-c-driver: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Wed Oct 25 18:29:45 2017
New Revision: 452887
URL: https://svnweb.freebsd.org/changeset/ports/452887

Log:
  Update to 1.8.1
  
  Changes:	https://github.com/mongodb/mongo-c-driver/releases
  PR:		223186
  Submitted by:	Krzysztof <ports at bsdserwis.com> (maintainer)

Added:
  head/devel/mongo-c-driver/files/
  head/devel/mongo-c-driver/files/patch-tests-test-mongoc-topology.c   (contents, props changed)
Modified:
  head/devel/mongo-c-driver/Makefile
  head/devel/mongo-c-driver/distinfo

Modified: head/devel/mongo-c-driver/Makefile
==============================================================================
--- head/devel/mongo-c-driver/Makefile	Wed Oct 25 18:29:40 2017	(r452886)
+++ head/devel/mongo-c-driver/Makefile	Wed Oct 25 18:29:45 2017	(r452887)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mongo-c-driver
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 CATEGORIES=	devel
 
 MAINTAINER=	ports at bsdserwis.com
@@ -17,7 +17,8 @@ LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
 
-USES=		cmake:noninja pkgconfig
+USES=		cmake:outsource pkgconfig
+#USES=		cmake:noninja pkgconfig
 USE_LDCONFIG=	yes
 LDFLAGS+=	-pthread
 

Modified: head/devel/mongo-c-driver/distinfo
==============================================================================
--- head/devel/mongo-c-driver/distinfo	Wed Oct 25 18:29:40 2017	(r452886)
+++ head/devel/mongo-c-driver/distinfo	Wed Oct 25 18:29:45 2017	(r452887)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507309734
-SHA256 (mongodb-mongo-c-driver-1.8.0_GH0.tar.gz) = 603f88b4774c4258a00679df1f427621a817901829052454b43629e599974b0c
-SIZE (mongodb-mongo-c-driver-1.8.0_GH0.tar.gz) = 2891810
+TIMESTAMP = 1508859086
+SHA256 (mongodb-mongo-c-driver-1.8.1_GH0.tar.gz) = 610c74fad07bc232071c37439c224049e767a3f081538be7c7783711f0bad806
+SIZE (mongodb-mongo-c-driver-1.8.1_GH0.tar.gz) = 2892108

Added: head/devel/mongo-c-driver/files/patch-tests-test-mongoc-topology.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/mongo-c-driver/files/patch-tests-test-mongoc-topology.c	Wed Oct 25 18:29:45 2017	(r452887)
@@ -0,0 +1,45 @@
+This patch fixed the following build error. It can be removed in later
+release since upstream removed compression checks.
+
+Reference:	https://github.com/sunpoet/mongo-c-driver/commit/d35a67a404e3311257b7ad331e4f12d69ce5ec04
+
+--- CMakeFiles/test-libmongoc.dir/tests/test-mongoc-topology.c.o ---
+/wrkdirs/usr/ports/devel/mongo-c-driver/work/mongo-c-driver-1.8.1/tests/test-mongoc-topology.c:348:34: error: no member named 'compressors' in 'struct _mongoc_server_description_t'
+   BSON_ASSERT (bson_empty (&sd->compressors));
+                             ~~  ^
+/usr/local/include/libbson-1.0/bson.h:65:26: note: expanded from macro 'bson_empty'
+#define bson_empty(b) (((b)->len == 5) || !bson_get_data ((b))[4])
+                         ^
+/usr/local/include/libbson-1.0/bson-macros.h:192:26: note: expanded from macro 'BSON_ASSERT'
+      if (!(BSON_LIKELY (test))) {                         \
+                         ^~~~
+/usr/local/include/libbson-1.0/bson-macros.h:231:45: note: expanded from macro 'BSON_LIKELY'
+#define BSON_LIKELY(x) __builtin_expect (!!(x), 1)
+                                            ^
+/wrkdirs/usr/ports/devel/mongo-c-driver/work/mongo-c-driver-1.8.1/tests/test-mongoc-topology.c:348:34: error: no member named 'compressors' in 'struct _mongoc_server_description_t'
+   BSON_ASSERT (bson_empty (&sd->compressors));
+                             ~~  ^
+/usr/local/include/libbson-1.0/bson.h:65:60: note: expanded from macro 'bson_empty'
+#define bson_empty(b) (((b)->len == 5) || !bson_get_data ((b))[4])
+                                                           ^
+/usr/local/include/libbson-1.0/bson-macros.h:192:26: note: expanded from macro 'BSON_ASSERT'
+      if (!(BSON_LIKELY (test))) {                         \
+                         ^~~~
+/usr/local/include/libbson-1.0/bson-macros.h:231:45: note: expanded from macro 'BSON_LIKELY'
+#define BSON_LIKELY(x) __builtin_expect (!!(x), 1)
+                                            ^
+2 errors generated.
+*** [CMakeFiles/test-libmongoc.dir/tests/test-mongoc-topology.c.o] Error code 1
+
+--- tests/test-mongoc-topology.c.orig	2017-10-11 23:52:36 UTC
++++ tests/test-mongoc-topology.c
+@@ -345,7 +345,9 @@ _test_topology_invalidate_server (bool p
+    BSON_ASSERT (bson_empty (&sd->hosts));
+    BSON_ASSERT (bson_empty (&sd->passives));
+    BSON_ASSERT (bson_empty (&sd->arbiters));
++#ifdef MONGOC_ENABLE_COMPRESSION
+    BSON_ASSERT (bson_empty (&sd->compressors));
++#endif
+ 
+    mongoc_server_stream_cleanup (server_stream);
+