summaryrefslogtreecommitdiff
path: root/databases/mongo-c-driver
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-12-17 14:25:30 +0000
committerjoerg <joerg@pkgsrc.org>2016-12-17 14:25:30 +0000
commit076aba6ea756a41ed97c3c15cf70277afa8a0462 (patch)
treead925f6a29d4c53d65a0a69bc33d8fda4b3ab9d6 /databases/mongo-c-driver
parentd8308caded77dc08366fd7b3ee57520c3ecccf64 (diff)
downloadpkgsrc-076aba6ea756a41ed97c3c15cf70277afa8a0462.tar.gz
Add missing Python build dependency. Deal with MAX/MIN macros on NetBSD
and possibly other systems.
Diffstat (limited to 'databases/mongo-c-driver')
-rw-r--r--databases/mongo-c-driver/Makefile9
-rw-r--r--databases/mongo-c-driver/distinfo3
-rw-r--r--databases/mongo-c-driver/patches/patch-src_mongoc_mongoc-cursor.c23
3 files changed, 33 insertions, 2 deletions
diff --git a/databases/mongo-c-driver/Makefile b/databases/mongo-c-driver/Makefile
index 2eacf3b46ae..c68ba041ad4 100644
--- a/databases/mongo-c-driver/Makefile
+++ b/databases/mongo-c-driver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/12/09 13:54:21 fhajny Exp $
+# $NetBSD: Makefile,v 1.22 2016/12/17 14:25:30 joerg Exp $
DISTNAME= mongo-c-driver-1.5.0
CATEGORIES= databases
@@ -32,6 +32,13 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man3
#TEST_MAKE_FLAGS+= MONGOC_TEST_SKIP_LIVE=on
#TEST_TARGET= check
+BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
+PYTHON_FOR_BUILD_ONLY= yes
+REPLACE_PYTHON+= doc/mallard2man.py
+
+.include "../../lang/python/application.mk"
+
# libbson and mongo-c-driver released are tied
BUILDLINK_API_DEPENDS.libbson+= libbson>=${PKGVERSION_NOREV}
.include "../../devel/libbson/buildlink3.mk"
diff --git a/databases/mongo-c-driver/distinfo b/databases/mongo-c-driver/distinfo
index a026a905fff..ecfa5b8c5f2 100644
--- a/databases/mongo-c-driver/distinfo
+++ b/databases/mongo-c-driver/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2016/12/09 13:54:21 fhajny Exp $
+$NetBSD: distinfo,v 1.21 2016/12/17 14:25:30 joerg Exp $
SHA1 (mongo-c-driver-1.5.0.tar.gz) = 0efbee3a8cad869d173a21ef1be0efebdce1bc5d
RMD160 (mongo-c-driver-1.5.0.tar.gz) = f95263ba6100314043b28515be119097c647d603
SHA512 (mongo-c-driver-1.5.0.tar.gz) = 28dbe86d16fe2b81adde1f0735b8a29027ef10c9e6a006de5230aaa93a1eca1423ab60347f3a080fc28dbba4373c867abfbb770ebf71b1660177d932db423c2c
Size (mongo-c-driver-1.5.0.tar.gz) = 6259776 bytes
+SHA1 (patch-src_mongoc_mongoc-cursor.c) = 9e0ada19f237972c9671bd90ff656ab9249f694f
diff --git a/databases/mongo-c-driver/patches/patch-src_mongoc_mongoc-cursor.c b/databases/mongo-c-driver/patches/patch-src_mongoc_mongoc-cursor.c
new file mode 100644
index 00000000000..590f9c01849
--- /dev/null
+++ b/databases/mongo-c-driver/patches/patch-src_mongoc_mongoc-cursor.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_mongoc_mongoc-cursor.c,v 1.1 2016/12/17 14:25:31 joerg Exp $
+
+MAX/MIN overlap with NetBSD sys/param.h's macros, so make sure to get the
+local version defined last.
+
+--- src/mongoc/mongoc-cursor.c.orig 2016-12-17 13:38:09.957899312 +0000
++++ src/mongoc/mongoc-cursor.c
+@@ -16,7 +16,6 @@
+
+
+ #include "mongoc-cursor.h"
+-#include "mongoc-cursor-private.h"
+ #include "mongoc-client-private.h"
+ #include "mongoc-counters-private.h"
+ #include "mongoc-error.h"
+@@ -26,6 +25,7 @@
+ #include "mongoc-read-concern-private.h"
+ #include "mongoc-util-private.h"
+ #include "mongoc-write-concern-private.h"
++#include "mongoc-cursor-private.h"
+
+
+ #undef MONGOC_LOG_DOMAIN