svn commit: r468952 - in head/databases/mongodb36: . files
Kirill Ponomarev
krion at FreeBSD.org
Thu May 3 17:52:42 UTC 2018
Author: krion
Date: Thu May 3 17:52:41 2018
New Revision: 468952
URL: https://svnweb.freebsd.org/changeset/ports/468952
Log:
Add support for the new ${name}_limits mechanics on CURRENT and
preserve the old behavior for the old systems.
PR: 226907
Submitted by: mp0 at FreeBSD.org
Approved by: maintainer
Modified:
head/databases/mongodb36/Makefile
head/databases/mongodb36/files/mongod.in
Modified: head/databases/mongodb36/Makefile
==============================================================================
--- head/databases/mongodb36/Makefile Thu May 3 17:49:52 2018 (r468951)
+++ head/databases/mongodb36/Makefile Thu May 3 17:52:41 2018 (r468952)
@@ -3,6 +3,7 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
DISTVERSION= 3.6.4
+PORTREVISION= 1
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/ \
@@ -65,6 +66,14 @@ SSL_MAKE_ARGS= --ssl
SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
.else
SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.endif
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
.endif
ALL_TARGET= core
Modified: head/databases/mongodb36/files/mongod.in
==============================================================================
--- head/databases/mongodb36/files/mongod.in Thu May 3 17:49:52 2018 (r468951)
+++ head/databases/mongodb36/files/mongod.in Thu May 3 17:52:41 2018 (r468952)
@@ -9,9 +9,9 @@
#
# 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.
+%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb`
+%%LEGACY_LIMITS%%# 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.
@@ -28,7 +28,7 @@ rcvar=mongod_enable
load_rc_config $name
: ${mongod_enable="NO"}
-: ${mongod_limits="NO"}
+%%LEGACY_LIMITS%%: ${mongod_limits="NO"}
: ${mongod_dbpath="/var/db/mongodb"}
: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"}
: ${mongod_user="mongodb"}
@@ -51,11 +51,12 @@ mongod_prestart()
if [ ! -d ${mongod_dbpath} ]; 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
+%%LEGACY_LIMITS%% if checkyesno mongod_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
}
run_rc_command "$1"
More information about the svn-ports-all
mailing list