Date: Thu, 21 Apr 2016 22:27:38 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413757 - in head/databases/influxdb: . files Message-ID: <201604212227.u3LMRcCO062466@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: girgen Date: Thu Apr 21 22:27:38 2016 New Revision: 413757 URL: https://svnweb.freebsd.org/changeset/ports/413757 Log: The load_rc_config need to happen before the : ${influx_flags:=xxx} since these variables are used in for example command_args=xxx. the colon construct only sets the variable if it is not set. Approved-by: maintainer Modified: head/databases/influxdb/Makefile head/databases/influxdb/files/influxd.in Modified: head/databases/influxdb/Makefile ============================================================================== --- head/databases/influxdb/Makefile Thu Apr 21 20:53:01 2016 (r413756) +++ head/databases/influxdb/Makefile Thu Apr 21 22:27:38 2016 (r413757) @@ -2,6 +2,7 @@ PORTNAME= influxdb PORTVERSION= 0.12.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= databases net-mgmt Modified: head/databases/influxdb/files/influxd.in ============================================================================== --- head/databases/influxdb/files/influxd.in Thu Apr 21 20:53:01 2016 (r413756) +++ head/databases/influxdb/files/influxd.in Thu Apr 21 22:27:38 2016 (r413757) @@ -23,6 +23,7 @@ name="influxd" rcvar=influxd_enable +load_rc_config $name : ${influxd_enable:="NO"} : ${influxd_user:="%%INFLUXD_USER%%"} @@ -35,7 +36,7 @@ rcvar=influxd_enable influxd_pidfile="%%INFLUXD_PIDDIR%%${name}.pid" procname="%%PREFIX%%/bin/${name}" command=/usr/sbin/daemon -command_args=" -c -p ${influxd_pidfile} ${procname} ${influxd_options}" +command_args="-c -p ${influxd_pidfile} ${procname} ${influxd_options}" start_precmd="influxd_precmd" influxd_precmd() @@ -43,5 +44,4 @@ influxd_precmd() install -o ${influxd_user} /dev/null ${influxd_pidfile} } -load_rc_config $name run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604212227.u3LMRcCO062466>