databases/mongodb32: 3.2.3 -> 3.2.4

- modified pkg-plist from exec/unexec to @sample
- provide a simplified mongodb.conf file
- Fixed issue with setting optime when running with journaling
  disabled: SERVER-22495, SERVER-22728
- Have read concern majority reflect journaled state on the primary:
  SERVER-22269
- Fixed issue where specifying replication.enableMajorityReadConcern
  implied true regardless of the actual boolean value: SERVER-22683
- Fixed issue causing segfault when running aggregation that includes
  $lookup: SERVER-22537

PR:		207842
Submitted by:	numisemis@yahoo.com
Approved by:	Brendan Molloy <brendan+freebsd@bbqsrc.net> (maintainer)

4 files changed, 37 insertions, 5 deletions

diff --git a/databases/mongodb32/Makefile b/databases/mongodb32/Makefile
index 29fc265eab43..f96aa6bcd182 100644
--- a/databases/mongodb32/Makefile
+++ b/databases/mongodb32/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mongodb32
-PORTVERSION=	3.2.3
+PORTVERSION=	3.2.4
 DISTVERSIONPREFIX=	r
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
@@ -34,6 +34,7 @@ CHOSEN_COMPILER_TYPE=	clang
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"
 
+CONFLICTS_BUILD=	mongo-cxx-driver
 OPTIONS_DEFINE=		SASL SSL
 OPTIONS_DEFAULT=	SASL SSL
 
@@ -68,6 +69,7 @@ post-install:
 .for f in mongo mongod mongoperf mongos mongosniff
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
+	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 
 do-test:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
diff --git a/databases/mongodb32/distinfo b/databases/mongodb32/distinfo
index 8387f8268152..69a554039571 100644
--- a/databases/mongodb32/distinfo
+++ b/databases/mongodb32/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mongodb-src-r3.2.3.tar.gz) = 82030ada190095b5d95c0b59e9cf74efe9db602b49d2b8857b06f2683a5227fa
-SIZE (mongodb-src-r3.2.3.tar.gz) = 29607224
+SHA256 (mongodb-src-r3.2.4.tar.gz) = b60743cc641de975c38e6e69ebbef60059ee9fe176cdd98bfab8d5c844dab42c
+SIZE (mongodb-src-r3.2.4.tar.gz) = 29647777
diff --git a/databases/mongodb32/files/patch-rpm_mongod.conf b/databases/mongodb32/files/patch-rpm_mongod.conf
new file mode 100644
index 000000000000..52159af5fb27
--- /dev/null
+++ b/databases/mongodb32/files/patch-rpm_mongod.conf
@@ -0,0 +1,31 @@
+--- rpm/mongod.conf.orig	2016-03-01 04:38:06 UTC
++++ rpm/mongod.conf
+@@ -1,4 +1,4 @@
+-# mongod.conf
++# mongodb.conf
+ 
+ # for documentation of all options, see:
+ #   http://docs.mongodb.org/manual/reference/configuration-options/
+@@ -7,11 +7,11 @@
+ systemLog:
+   destination: file
+   logAppend: true
+-  path: /var/log/mongodb/mongod.log
++  path: /var/log/mongodb/log
+ 
+ # Where and how to store data.
+ storage:
+-  dbPath: /var/lib/mongo
++  dbPath: /var/db/mongo
+   journal:
+     enabled: true
+ #  engine:
+@@ -21,7 +21,7 @@ storage:
+ # how the process runs
+ processManagement:
+   fork: true  # fork and run in background
+-  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
++  pidFilePath: /var/run/mongodb/pid  # location of pidfile
+ 
+ # network interfaces
+ net:
diff --git a/databases/mongodb32/pkg-plist b/databases/mongodb32/pkg-plist
index 2f0f87183282..fbc480c26786 100644
--- a/databases/mongodb32/pkg-plist
+++ b/databases/mongodb32/pkg-plist
@@ -1,5 +1,4 @@
-@unexec if [ ! -s %D/etc/mongodb.conf ]; then /bin/rm -f %D/etc/mongodb.conf; fi
-@exec  if [ ! -f %D/etc/mongodb.conf ]; then /usr/bin/touch %D/etc/mongodb.conf; fi
+@sample etc/mongodb.conf.sample
 bin/mongo
 bin/mongod
 bin/mongoperf