Index: head/databases/mongodb34-rocks/Makefile
===================================================================
--- head/databases/mongodb34-rocks/Makefile	(revision 446001)
+++ head/databases/mongodb34-rocks/Makefile	(revision 446002)
@@ -1,91 +1,91 @@
 # $FreeBSD$
 
 PORTNAME=	mongodb
 PORTVERSION=	3.4.4
 DISTVERSIONPREFIX=	r
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/ \
 		http://download.mongodb.org/src/
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}-rocks
 DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Distributed document-oriented database with a RocksDB Storage Engine
 
 # mongodb is AGPLv3, C++ driver is APACHE20
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy \
 		libboost_system.so:devel/boost-libs \
 		librocksdb.so:databases/rocksdb \
 		liblz4.so:archivers/liblz4
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo
 
 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
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USE=	yes
 SSL_MAKE_ARGS=	--ssl
 
 USES=		compiler:c++14-lang cpe execinfo python:build scons
 USE_GITHUB=	nodefault
 GH_TUPLE=	mongodb-partners:mongo-rocks:r${PORTVERSION}:module/src/mongo/db/modules/rocks
 
 WITH_DEBUG=yes
 MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
 		--use-system-pcre --use-system-snappy \
 		--use-system-boost --use-system-zlib \
 		--cxx-std=14 --libc++ \
 		--runtime-hardening=on \
 		--disable-warnings-as-errors \
 		VERBOSE=on
 
 USERS=	mongodb
 GROUPS=	mongodb
 
 USE_RC_SUBR=	mongod \
 		mongos
 
 ALL_TARGET=	core
 TEST_TARGET=	unittests
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 USES+=	ssl
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-install:
 .for f in mongo mongod mongoperf mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongod.conf.sample
 
 do-test:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\
 		${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\
 		--suites=unittests --jobs=${MAKE_JOBS_NUMBER}
 
 PORTSCOUT=	limitw:1,even
 
 CPE_PRODUCT=	mongodb
 
 .include <bsd.port.post.mk>
Index: head/databases/mongodb34-rocks/files/mongod.in
===================================================================
--- head/databases/mongodb34-rocks/files/mongod.in	(revision 446001)
+++ head/databases/mongodb34-rocks/files/mongod.in	(revision 446002)
@@ -1,63 +1,64 @@
 #!/bin/sh
 
 # PROVIDE: mongod
 # REQUIRE: NETWORK ldconfig
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # mongod_enable (bool):  Set to "NO" by default.
 #                        Set it to "YES" to enable mongod.
 # mongod_limits (bool):  Set to "NO" by default.
 #                        Set it to yes to run `limits -e -U mongodb`
 #                        just before mongod starts.
 # mongod_dbpath (str):   Default to "/var/db/mongodb"
 #                        Base database directory.
 # mongod_flags (str):    Custom additional arguments to be passed to mongod.
 #                        Default to "--logpath /var/log/mongodb/mongod.log --logappend".
 # mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
 #                        Path to config file
 #
 
 . /etc/rc.subr
 
 name="mongod"
 rcvar=mongod_enable
 
 load_rc_config $name
 
 : ${mongod_enable="NO"}
 : ${mongod_limits="NO"}
 : ${mongod_dbpath="/var/db/mongodb"}
 : ${mongod_logpath="/var/log/mongodb"}
+: ${mongod_runpath="/var/run/mongodb"}
 : ${mongod_flags="--logpath ${mongod_logpath}/mongod.log --logappend"}
 : ${mongod_user="mongodb"}
 : ${mongod_group="mongodb"}
 : ${mongod_config="%%PREFIX%%/etc/mongod.conf"}
 
-pidfile="/var/run/mongodb/mongod.pid"
+pidfile="${mongod_runpath}/mongod.pid"
 command=%%PREFIX%%/bin/${name}
 command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
 start_precmd="${name}_prestart"
 
 mongod_create_dbpath()
 {
-        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
-        mkdir ${mongod_logpath} >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath} ${mongod_logpath}
+	install -d -g ${mongod_group} -o ${mongod_user} -m 755 ${mongod_dbpath}
+	install -d -g ${mongod_group} -o ${mongod_user} -m 755 ${mongod_logpath}
+	install -d -g ${mongod_group} -o ${mongod_user} -m 755 ${mongod_runpath}
 }
 
 mongod_prestart()
 {
         if [ ! -d ${mongod_dbpath} -o ! -d ${mongod_logpath} ]; then
                 mongod_create_dbpath || return 1
         fi
         if checkyesno mongod_limits; then
                 eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
         else
                 return 0
         fi
 }
 
 run_rc_command "$1"
Index: head/databases/mongodb34-rocks/files/mongos.in
===================================================================
--- head/databases/mongodb34-rocks/files/mongos.in	(revision 446001)
+++ head/databases/mongodb34-rocks/files/mongos.in	(revision 446002)
@@ -1,59 +1,60 @@
 #!/bin/sh
 
 # PROVIDE: mongos
 # REQUIRE: NETWORK ldconfig
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # mongos_enable (bool):  Set to "NO" by default.
 #                        Set it to "YES" to enable mongos.
 # mongos_limits (bool):  Set to "NO" by default.
 #                        Set it to yes to run `limits -e -U mongodb`
 #                        just before mongos starts.
 # mongos_flags (str):    Custom additional arguments to be passed to mongos.
 #                        Default to "--logpath /var/log/mongodb/mongos.log --logappend".
 # mongos_config (str):	 Default to "%%PREFIX%%/etc/mongos.conf"
 #                        Path to config file
 #
 
 . /etc/rc.subr
 
 name="mongos"
 rcvar=mongos_enable
 
 load_rc_config $name
 
 : ${mongos_enable="NO"}
 : ${mongos_limits="NO"}
 : ${mongos_logpath="/var/log/mongodb"}
+: ${mongos_runpath="/var/run/mongodb"}
 : ${mongos_flags="--logpath ${mongos_logpath}/mongos.log --logappend"}
 : ${mongos_user="mongodb"}
 : ${mongos_group="mongodb"}
 : ${mongos_config="%%PREFIX%%/etc/mongos.conf"}
 
-pidfile="/var/run/mongodb/mongos.pid"
+pidfile="${mongos_runpath}/mongos.pid"
 command=%%PREFIX%%/bin/${name}
 command_args="--config $mongos_config --fork >/dev/null 2>/dev/null"
 start_precmd="${name}_prestart"
 
 mongos_create_dbpath()
 {
-        mkdir ${mongos_logpath} >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mongos_user}:${mongos_group} ${mongos_logpath}
+        install -d -g ${mongos_group} -o ${mongos_user} -m 755 ${mongos_logpath}
+        install -d -g ${mongos_group} -o ${mongos_user} -m 755 ${mongos_runpath}
 }
 
 mongos_prestart()
 {
         if [ ! -d ${mongos_logpath} ]; then
                 mongos_create_dbpath || return 1
         fi
         if checkyesno mongos_limits; then
                 eval `/usr/bin/limits -e -U ${mongos_user}` 2>/dev/null
         else
                 return 0
         fi
 }
 
 run_rc_command "$1"