From owner-svn-ports-head@freebsd.org  Thu Apr 21 22:27:39 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8465B180A0;
 Thu, 21 Apr 2016 22:27:39 +0000 (UTC)
 (envelope-from girgen@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 mx1.freebsd.org (Postfix) with ESMTPS id 877861EFE;
 Thu, 21 Apr 2016 22:27:39 +0000 (UTC)
 (envelope-from girgen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3LMRcYU062468;
 Thu, 21 Apr 2016 22:27:38 GMT (envelope-from girgen@FreeBSD.org)
Received: (from girgen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3LMRcCO062466;
 Thu, 21 Apr 2016 22:27:38 GMT (envelope-from girgen@FreeBSD.org)
Message-Id: <201604212227.u3LMRcCO062466@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: girgen set sender to
 girgen@FreeBSD.org using -f
From: Palle Girgensohn <girgen@FreeBSD.org>
Date: Thu, 21 Apr 2016 22:27:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413757 - in head/databases/influxdb: . 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-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Apr 2016 22:27:39 -0000

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"