From owner-svn-ports-head@freebsd.org Sat Jun 9 19:25:57 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF2D2100B6D4; Sat, 9 Jun 2018 19:25:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7025770399; Sat, 9 Jun 2018 19:25:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5284922164; Sat, 9 Jun 2018 19:25:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w59JPves067090; Sat, 9 Jun 2018 19:25:57 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w59JPvXA067089; Sat, 9 Jun 2018 19:25:57 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201806091925.w59JPvXA067089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 9 Jun 2018 19:25:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472082 - in head/databases/arangodb33: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/databases/arangodb33: . files X-SVN-Commit-Revision: 472082 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2018 19:25:58 -0000 Author: riggs Date: Sat Jun 9 19:25:56 2018 New Revision: 472082 URL: https://svnweb.freebsd.org/changeset/ports/472082 Log: Adapt ${name}_limits to the new resource limiting mechanics for services While on it: - Pet portlint PR: 227221 Submitted by: 0mp Approved by: maintainer timeout Modified: head/databases/arangodb33/Makefile head/databases/arangodb33/files/arangod.in Modified: head/databases/arangodb33/Makefile ============================================================================== --- head/databases/arangodb33/Makefile Sat Jun 9 19:14:05 2018 (r472081) +++ head/databases/arangodb33/Makefile Sat Jun 9 19:25:56 2018 (r472082) @@ -3,10 +3,11 @@ PORTNAME= arangodb DISTVERSIONPREFIX= v DISTVERSION= 3.3.7 +PORTREVISION= 1 CATEGORIES= databases net PKGNAMESUFFIX= 33 -MAINTAINER= dev@dudu.ro +MAINTAINER= dev@dudu.ro COMMENT= ArangoDB is a distributed NoSQL database with multiple data models LICENSE= APACHE20 @@ -29,6 +30,14 @@ CMAKE_ARGS= -DBASE_LD_FLAGS:STRING="-L${BUILD_WRKSRC}/ USERS= arangodb GROUPS= arangodb USE_RC_SUBR= arangod + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif post-install: .for section in 1 8 Modified: head/databases/arangodb33/files/arangod.in ============================================================================== --- head/databases/arangodb33/files/arangod.in Sat Jun 9 19:14:05 2018 (r472081) +++ head/databases/arangodb33/files/arangod.in Sat Jun 9 19:25:56 2018 (r472082) @@ -9,13 +9,13 @@ # # arangod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable arangod. -# arangod_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U arangodb` -# just before arangod starts. +%%LEGACY_LIMITS%%# arangod_limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U arangodb` +%%LEGACY_LIMITS%%# just before arangod starts. # arangod_dbpath (str): Default to "/var/db/arangodb" # Base database directory. # arangod_logpath (str): Default to "/var/log/arangodb" -# Base logging directory +# Base logging directory # arangod_apppath (str): Default to "/var/db/arangodb-apps" # Base apps directory # arangod_flags (str): Custom additional arguments to be passed to arangod. @@ -32,7 +32,7 @@ rcvar=arangod_enable load_rc_config $name : ${arangod_enable="NO"} -: ${arangod_limits="NO"} +%%LEGACY_LIMITS%%: ${arangod_limits="NO"} : ${arangod_dbpath="/var/db/arangodb"} : ${arangod_logpath="/var/log/arangodb"} : ${arangod_apppath="/var/db/arangodb-apps"} @@ -75,11 +75,12 @@ arangod_prestart() if [ ! -d ${arangod_apppath} ]; then arangod_create_apppath || return 1 fi - if checkyesno arangod_limits; then - eval `/usr/bin/limits -e -U ${arangod_user}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno arangod_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${arangod_user}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } run_rc_command "$1"