From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 10 15:58:38 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 369A0DC4;
 Sat, 10 Nov 2012 15:58:38 +0000 (UTC)
 (envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1B78B8FC0A;
 Sat, 10 Nov 2012 15:58:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAAFwbBh050568;
 Sat, 10 Nov 2012 15:58:37 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAAFwbNN050567;
 Sat, 10 Nov 2012 15:58:37 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201211101558.qAAFwbNN050567@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sat, 10 Nov 2012 15:58:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307290 - head/net-mgmt/openvmps/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.14
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: Sat, 10 Nov 2012 15:58:38 -0000

Author: crees
Date: Sat Nov 10 15:58:37 2012
New Revision: 307290
URL: http://svnweb.freebsd.org/changeset/ports/307290

Log:
  Fix rc file order to respect defaults correctly, style nits and stop
  calling test where expressions will do.
  
  Feature safe:	yes

Modified:
  head/net-mgmt/openvmps/files/vmpsd.in

Modified: head/net-mgmt/openvmps/files/vmpsd.in
==============================================================================
--- head/net-mgmt/openvmps/files/vmpsd.in	Sat Nov 10 15:38:55 2012	(r307289)
+++ head/net-mgmt/openvmps/files/vmpsd.in	Sat Nov 10 15:58:37 2012	(r307290)
@@ -1,28 +1,29 @@
 #!/bin/sh
 
-# Start or stop vmpsd
 # $FreeBSD$
 
 # PROVIDE: vmpsd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
+. /etc/rc.subr
+
+name=vmpsd
+rcvar=vmpsd_enable
+
+load_rc_config $name
+
 # Define these vmpsd_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/vmpsd
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE 
-#
-[ -z "$vmpsd_enable" ] && vmpsd_enable="NO" # Enable vmpsd
-#vmpsd_program="%%PREFIX%%/sbin/vmpsd"       # Location of vmpsd
-[ -z "$vmpsd_flags" ] && vmpsd_flags="-f /usr/local/etc/vmps.db"   # Flags to vmpsd program
 
-. /etc/rc.subr
+: ${vmpsd_enable:=NO}				# Enable vmpsd
+: ${vmpsd_program:=%%PREFIX%%/sbin/vmpsd}	# Location of vmpsd
+: ${vmpsd_flags=-f /usr/local/etc/vmps.db}	# Flags to vmpsd program
 
-name="vmpsd"
-rcvar=vmpsd_enable
-command="%%PREFIX%%/sbin/${name}"
+command=%%PREFIX%%/sbin/${name}
 
-load_rc_config $name
-run_rc_command "$1"
+run_rc_command $1