From 3dcf2a9638bc219bda743e19a43d86ec8c42340c Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Fri, 19 Apr 2013 10:59:20 +0000
Subject: [PATCH] Update to 2.4.2 release. Simplify rc script. Fix build with
 spidermonkey [1].

PR:		ports/177703 [1]
Submitted by:	Dmitry Sukhodoyev <raven428@gmail.com>
Feature safe:	yes
---
 databases/mongodb/Makefile               | 2 +-
 databases/mongodb/distinfo               | 4 ++--
 databases/mongodb/files/mongod.in        | 6 ++----
 databases/mongodb/files/patch-SConstruct | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index 0b49ac54c966..ae315cdbff42 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mongodb
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	databases net
 MASTER_SITES=	http://downloads.mongodb.org/src/
 DISTNAME=	${PORTNAME}-src-r${PORTVERSION}
diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index cb582529a8fd..a0f3db1ed013 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mongodb-src-r2.4.1.tar.gz) = d61ad944b8f27e0efb9a08998cbda587ee5d1a4406a938443e681502738da3b2
-SIZE (mongodb-src-r2.4.1.tar.gz) = 14101118
+SHA256 (mongodb-src-r2.4.2.tar.gz) = d0a26fef7f425a6652ebfc3addbc7e1b01a10be65c9d68e464730687bd6721c3
+SIZE (mongodb-src-r2.4.2.tar.gz) = 14106623
diff --git a/databases/mongodb/files/mongod.in b/databases/mongodb/files/mongod.in
index a06b88ff5226..bdf24bea76e0 100644
--- a/databases/mongodb/files/mongod.in
+++ b/databases/mongodb/files/mongod.in
@@ -14,8 +14,6 @@
 #                        just before mongod starts.
 # mongod_dbpath (str):   Default to "/var/db/mongodb"
 #                        Base database directory.
-# mongod_pidfile (str):  Custum PID file path and name.
-#                        Default to "${mongod_dbpath}/mongod.pid".
 # mongod_flags (str):    Custom additional arguments to be passed to mongod.
 #                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
 #
@@ -34,9 +32,9 @@ load_rc_config $name
 : ${mongod_user="mongodb"}
 : ${mongod_group="mongodb"}
 
-pidfile=${mongod_pidfile:-"${mongod_dbpath}/mongod.pid"}
+pidfile="${mongod_dbpath}/mongod.lock"
 command=%%PREFIX%%/bin/${name}
-command_args="--config %%PREFIX%%/etc/mongodb.conf --dbpath $mongod_dbpath --pidfilepath ${pidfile} --fork"
+command_args="--config %%PREFIX%%/etc/mongodb.conf --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
 start_precmd="${name}_prestart"
 
 mongod_create_dbpath()
diff --git a/databases/mongodb/files/patch-SConstruct b/databases/mongodb/files/patch-SConstruct
index 7fccb9f6a9fb..7aed7e777a6b 100644
--- a/databases/mongodb/files/patch-SConstruct
+++ b/databases/mongodb/files/patch-SConstruct
@@ -23,7 +23,7 @@
 +        if not conf.CheckLib("snappy"):
 +            Exit(1)
 +
-+    if usesm and use_system_version_of_library("js"):
++    if usesm and use_system_version_of_library("sm"):
 +        if not conf.CheckLib("js"):
 +            Exit(1)
 +