From owner-svn-ports-all@FreeBSD.ORG Fri Apr 19 10:59:21 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9DE9138A; Fri, 19 Apr 2013 10:59:21 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7F399CEF; Fri, 19 Apr 2013 10:59:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3JAxLOX044597; Fri, 19 Apr 2013 10:59:21 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3JAxKqQ044500; Fri, 19 Apr 2013 10:59:20 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201304191059.r3JAxKqQ044500@svn.freebsd.org> From: Alex Dupre Date: Fri, 19 Apr 2013 10:59:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316093 - in head/databases/mongodb: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Apr 2013 10:59:21 -0000 Author: ale Date: Fri Apr 19 10:59:20 2013 New Revision: 316093 URL: http://svnweb.freebsd.org/changeset/ports/316093 Log: Update to 2.4.2 release. Simplify rc script. Fix build with spidermonkey [1]. PR: ports/177703 [1] Submitted by: Dmitry Sukhodoyev Feature safe: yes Modified: head/databases/mongodb/Makefile head/databases/mongodb/distinfo head/databases/mongodb/files/mongod.in head/databases/mongodb/files/patch-SConstruct Modified: head/databases/mongodb/Makefile ============================================================================== --- head/databases/mongodb/Makefile Fri Apr 19 09:21:28 2013 (r316092) +++ head/databases/mongodb/Makefile Fri Apr 19 10:59:20 2013 (r316093) @@ -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} Modified: head/databases/mongodb/distinfo ============================================================================== --- head/databases/mongodb/distinfo Fri Apr 19 09:21:28 2013 (r316092) +++ head/databases/mongodb/distinfo Fri Apr 19 10:59:20 2013 (r316093) @@ -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 Modified: head/databases/mongodb/files/mongod.in ============================================================================== --- head/databases/mongodb/files/mongod.in Fri Apr 19 09:21:28 2013 (r316092) +++ head/databases/mongodb/files/mongod.in Fri Apr 19 10:59:20 2013 (r316093) @@ -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() Modified: head/databases/mongodb/files/patch-SConstruct ============================================================================== --- head/databases/mongodb/files/patch-SConstruct Fri Apr 19 09:21:28 2013 (r316092) +++ head/databases/mongodb/files/patch-SConstruct Fri Apr 19 10:59:20 2013 (r316093) @@ -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) +