Fix PLIST SSL option handling, thanks joerg@ for the headsup. PKGREVISION++

2 files changed, 23 insertions, 22 deletions

diff --git a/databases/mongo-c-driver/Makefile b/databases/mongo-c-driver/Makefile
index 1e8010040bf..9aaacc344ee 100644
--- a/databases/mongo-c-driver/Makefile
+++ b/databases/mongo-c-driver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/08/17 14:11:42 fhajny Exp $
+# $NetBSD: Makefile,v 1.19 2016/09/05 08:43:10 fhajny Exp $
 
 DISTNAME=	mongo-c-driver-1.4.0
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mongodb/}
 
diff --git a/databases/mongo-c-driver/PLIST b/databases/mongo-c-driver/PLIST
index 41047e10252..19ca74e1783 100644
--- a/databases/mongo-c-driver/PLIST
+++ b/databases/mongo-c-driver/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/08/17 14:11:42 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/09/05 08:43:10 fhajny Exp $
 bin/mongoc-stat
 include/libmongoc-1.0/mongoc-apm-private.h
 include/libmongoc-1.0/mongoc-apm.h
@@ -19,9 +19,9 @@ include/libmongoc-1.0/mongoc-collection.h
 include/libmongoc-1.0/mongoc-config.h
 include/libmongoc-1.0/mongoc-counters-private.h
 include/libmongoc-1.0/mongoc-counters.defs
-include/libmongoc-1.0/mongoc-crypto-cng-private.h
-include/libmongoc-1.0/mongoc-crypto-common-crypto-private.h
-include/libmongoc-1.0/mongoc-crypto-openssl-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-crypto-cng-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-crypto-common-crypto-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-crypto-openssl-private.h
 include/libmongoc-1.0/mongoc-crypto-private.h
 include/libmongoc-1.0/mongoc-cursor-array-private.h
 include/libmongoc-1.0/mongoc-cursor-cursorid-private.h
@@ -57,10 +57,10 @@ include/libmongoc-1.0/mongoc-matcher.h
 include/libmongoc-1.0/mongoc-memcmp-private.h
 include/libmongoc-1.0/mongoc-opcode-private.h
 include/libmongoc-1.0/mongoc-opcode.h
-include/libmongoc-1.0/mongoc-openssl-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-openssl-private.h
 include/libmongoc-1.0/mongoc-queue-private.h
-include/libmongoc-1.0/mongoc-rand-private.h
-include/libmongoc-1.0/mongoc-rand.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-concern-private.h
 include/libmongoc-1.0/mongoc-read-concern.h
 include/libmongoc-1.0/mongoc-read-prefs-private.h
@@ -68,30 +68,30 @@ 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-secure-channel-private.h
-include/libmongoc-1.0/mongoc-secure-transport-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-secure-channel-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-secure-transport-private.h
 include/libmongoc-1.0/mongoc-server-description-private.h
 include/libmongoc-1.0/mongoc-server-description.h
 include/libmongoc-1.0/mongoc-server-stream-private.h
 include/libmongoc-1.0/mongoc-set-private.h
 include/libmongoc-1.0/mongoc-socket-private.h
 include/libmongoc-1.0/mongoc-socket.h
-include/libmongoc-1.0/mongoc-ssl-private.h
-include/libmongoc-1.0/mongoc-ssl.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-ssl-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-ssl.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
-include/libmongoc-1.0/mongoc-stream-tls-openssl-bio-private.h
-include/libmongoc-1.0/mongoc-stream-tls-openssl-private.h
-include/libmongoc-1.0/mongoc-stream-tls-openssl.h
-include/libmongoc-1.0/mongoc-stream-tls-private.h
-include/libmongoc-1.0/mongoc-stream-tls-secure-channel-private.h
-include/libmongoc-1.0/mongoc-stream-tls-secure-channel.h
-include/libmongoc-1.0/mongoc-stream-tls-secure-transport-private.h
-include/libmongoc-1.0/mongoc-stream-tls-secure-transport.h
-include/libmongoc-1.0/mongoc-stream-tls.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-openssl-bio-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-openssl-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-openssl.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-secure-channel-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-secure-channel.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-secure-transport-private.h
+${PLIST.ssl}include/libmongoc-1.0/mongoc-stream-tls-secure-transport.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-topology-description-private.h
@@ -121,7 +121,7 @@ include/libmongoc-1.0/op-update.def
 include/libmongoc-1.0/utlist.h
 lib/libmongoc-1.0.la
 lib/pkgconfig/libmongoc-1.0.pc
-lib/pkgconfig/libmongoc-ssl-1.0.pc
+${PLIST.ssl}lib/pkgconfig/libmongoc-ssl-1.0.pc
 man/man3/mongoc_advanced_connections.3
 man/man3/mongoc_aggregate.3
 man/man3/mongoc_apm_callbacks_destroy.3