From owner-svn-ports-head@freebsd.org  Mon Apr 18 23:28:10 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 D28E8B12E8A;
 Mon, 18 Apr 2016 23:28:10 +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 A2C2613CC;
 Mon, 18 Apr 2016 23:28:10 +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 u3INS9Fi053636;
 Mon, 18 Apr 2016 23:28:09 GMT (envelope-from girgen@FreeBSD.org)
Received: (from girgen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3INS95Q053634;
 Mon, 18 Apr 2016 23:28:09 GMT (envelope-from girgen@FreeBSD.org)
Message-Id: <201604182328.u3INS95Q053634@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: Mon, 18 Apr 2016 23:28:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413616 - in head/net-mgmt/telegraf: . 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: Mon, 18 Apr 2016 23:28:10 -0000

Author: girgen
Date: Mon Apr 18 23:28:09 2016
New Revision: 413616
URL: https://svnweb.freebsd.org/changeset/ports/413616

Log:
  telegraf_flags will be applied to /usr/bin/daemon
  unless we force it empty there and used it explicitally.

Modified:
  head/net-mgmt/telegraf/Makefile
  head/net-mgmt/telegraf/files/telegraf.in

Modified: head/net-mgmt/telegraf/Makefile
==============================================================================
--- head/net-mgmt/telegraf/Makefile	Mon Apr 18 21:57:33 2016	(r413615)
+++ head/net-mgmt/telegraf/Makefile	Mon Apr 18 23:28:09 2016	(r413616)
@@ -3,6 +3,7 @@
 
 PORTNAME=	telegraf
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org

Modified: head/net-mgmt/telegraf/files/telegraf.in
==============================================================================
--- head/net-mgmt/telegraf/files/telegraf.in	Mon Apr 18 21:57:33 2016	(r413615)
+++ head/net-mgmt/telegraf/files/telegraf.in	Mon Apr 18 23:28:09 2016	(r413616)
@@ -26,8 +26,14 @@ load_rc_config $name
 : ${telegraf_conf:="%%PREFIX%%/etc/${name}.conf"}
 
 # daemon
+start_precmd=telegraf_prestart
 pidfile="/var/run/${name}.pid"
 command=/usr/sbin/daemon
 command_args="-crP ${pidfile} %%PREFIX%%/bin/${name} ${telegraf_flags} -config=${telegraf_conf} 2>> /var/log/telegraf.log"
 
+telegraf_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+        rc_flags=""
+}
+
 run_rc_command "$1"