From owner-svn-ports-all@freebsd.org  Tue Mar 22 08:52:28 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 80624AD845A;
 Tue, 22 Mar 2016 08:52:28 +0000 (UTC)
 (envelope-from tijl@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 52A64257;
 Tue, 22 Mar 2016 08:52:28 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2M8qRif038733;
 Tue, 22 Mar 2016 08:52:27 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2M8qR53038731;
 Tue, 22 Mar 2016 08:52:27 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201603220852.u2M8qR53038731@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 22 Mar 2016 08:52:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411640 - in head/sysutils/openhpi: . 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-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Mar 2016 08:52:28 -0000

Author: tijl
Date: Tue Mar 22 08:52:27 2016
New Revision: 411640
URL: https://svnweb.freebsd.org/changeset/ports/411640

Log:
  Improve the rc script a bit.  "-c <conf>" isn't optional.  Also use
  %%ETCDIR%% as suggested by jbeich.

Modified:
  head/sysutils/openhpi/Makefile
  head/sysutils/openhpi/files/openhpid.in

Modified: head/sysutils/openhpi/Makefile
==============================================================================
--- head/sysutils/openhpi/Makefile	Tue Mar 22 07:56:44 2016	(r411639)
+++ head/sysutils/openhpi/Makefile	Tue Mar 22 08:52:27 2016	(r411640)
@@ -2,6 +2,7 @@
 
 PORTNAME=	openhpi
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/openhpi/openhpi-stable/${PORTVERSION}/
 

Modified: head/sysutils/openhpi/files/openhpid.in
==============================================================================
--- head/sysutils/openhpi/files/openhpid.in	Tue Mar 22 07:56:44 2016	(r411639)
+++ head/sysutils/openhpi/files/openhpid.in	Tue Mar 22 08:52:27 2016	(r411640)
@@ -9,16 +9,17 @@
 # Add the following to /etc/rc.conf[.local] to enable this service
 #
 # openhpid_enable="YES"
-# openhpid_flags="-c %%PREFIX%%/etc/openhpi/openhpi.conf"
 #
 
 . /etc/rc.subr
 
-name="openhpid"
-rcvar="openhpid_enable"
-command="%%PREFIX%%/sbin/openhpid"
+: ${openhpid_enable:=NO} ${openhpid_config:=%%ETCDIR%%/openhpi.conf}
 
-: ${openhpid_enable=NO} ${openhpid_flags=-c %%PREFIX%%/etc/openhpi/openhpi.conf}
+name=openhpid
+rcvar=openhpid_enable
+command="%%PREFIX%%/sbin/openhpid"
+command_args="-c ${openhpid_config}"
+required_files="${openhpid_config}"
 
 load_rc_config ${name}
 run_rc_command "$1"