From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 13 21:24:02 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A74F9A8;
 Thu, 13 Mar 2014 21:24:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 675D713B;
 Thu, 13 Mar 2014 21:24:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2DLO28k098521;
 Thu, 13 Mar 2014 21:24:02 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2DLO2K4098520;
 Thu, 13 Mar 2014 21:24:02 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201403132124.s2DLO2K4098520@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Thu, 13 Mar 2014 21:24:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348129 - head/net-mgmt/nrpe/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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Mar 2014 21:24:02 -0000

Author: mandree
Date: Thu Mar 13 21:24:01 2014
New Revision: 348129
URL: http://svnweb.freebsd.org/changeset/ports/348129
QAT: https://qat.redports.org/buildarchive/r348129/

Log:
  Fix acquisition of pidfile location.
  
  PR:		ports/186837
  Submitted by:	Daniel Ylitalo <daniel@203webgroup.se>
  Approved by:	zeising (maintainer)

Modified:
  head/net-mgmt/nrpe/files/nrpe2.in

Modified: head/net-mgmt/nrpe/files/nrpe2.in
==============================================================================
--- head/net-mgmt/nrpe/files/nrpe2.in	Thu Mar 13 21:22:11 2014	(r348128)
+++ head/net-mgmt/nrpe/files/nrpe2.in	Thu Mar 13 21:24:01 2014	(r348129)
@@ -37,7 +37,7 @@ find_pidfile()
 	[ -n "$nrpe2_pidfile" ] &&
 	    warn "No longer necessary to set nrpe2_pidfile in rc.conf[.local]"
 
-	if get_pidfile_from_conf pid_file %%PREFIX%%/etc/nrpe.cfg; then
+	if get_pidfile_from_conf pid_file ${nrpe2_configfile}; then
 		pidfile="$_pidfile_from_conf"
 	else
 		pidfile='%%PIDDIR%%/nrpe2.pid'