From owner-svn-ports-head@FreeBSD.ORG  Fri Jul 12 11:27:13 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 1DD3280B;
 Fri, 12 Jul 2013 11:27:13 +0000 (UTC)
 (envelope-from feld@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 EA71B1E34;
 Fri, 12 Jul 2013 11:27:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6CBRCv2075187;
 Fri, 12 Jul 2013 11:27:12 GMT (envelope-from feld@svn.freebsd.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6CBRCmY075182;
 Fri, 12 Jul 2013 11:27:12 GMT (envelope-from feld@svn.freebsd.org)
Message-Id: <201307121127.r6CBRCmY075182@svn.freebsd.org>
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 12 Jul 2013 11:27:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322827 - in head/net/vnstat: . 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: Fri, 12 Jul 2013 11:27:13 -0000

Author: feld
Date: Fri Jul 12 11:27:12 2013
New Revision: 322827
URL: http://svnweb.freebsd.org/changeset/ports/322827

Log:
  - rc script improvements
  
  Approved by:	swills (mentor)

Modified:
  head/net/vnstat/Makefile
  head/net/vnstat/files/vnstat.in

Modified: head/net/vnstat/Makefile
==============================================================================
--- head/net/vnstat/Makefile	Fri Jul 12 11:22:20 2013	(r322826)
+++ head/net/vnstat/Makefile	Fri Jul 12 11:27:12 2013	(r322827)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vnstat
 PORTVERSION=	1.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://humdi.net/vnstat/ \
 		http://mirror.mcx2.org/

Modified: head/net/vnstat/files/vnstat.in
==============================================================================
--- head/net/vnstat/files/vnstat.in	Fri Jul 12 11:22:20 2013	(r322826)
+++ head/net/vnstat/files/vnstat.in	Fri Jul 12 11:27:12 2013	(r322827)
@@ -9,8 +9,6 @@
 # Add the following line to /etc/rc.conf to enable vnstat:
 #
 # vnstat_enable="YES"
-# vnstat_flags="-d -p ${vnstat_pidfile} --config %%PREFIX%%/etc/vnstat.cfg"
-# vnstat_pidfile="/var/run/vnstat/vnstat.pid"
 
 . /etc/rc.subr
 
@@ -18,14 +16,15 @@ name=vnstat
 rcvar=vnstat_enable
 load_rc_config $name
 
-vnstat_enable=${vnstat_enable-"NO"}
-vnstat_pidfile=${vnstat_pidfile-"/var/run/vnstat/vnstat.pid"}
-vnstat_flags=${vnstat_flags-"-d -p ${vnstat_pidfile} --config %%PREFIX%%/etc/vnstat.cfg"}
-vnstat_user=${vnstat_user-"%%USERS%%"}
-vnstat_group=${vnstat_group-"%%GROUPS%%"}
+: ${vnstat_enable:=NO}
+: ${vnstat_pidfile:=/var/run/vnstat/vnstat.pid}
+: ${vnstat_config:=%%PREFIX%%/etc/vnstat.conf}
+: ${vnstat_flags:="-d --noadd"}
+: ${vnstat_user:=%%USERS%%}
+: ${vnstat_group:=%%GROUPS%%}
 
 command="%%PREFIX%%/sbin/vnstatd"
-command_args="${vnstat_flags}"
+command_args="-p ${vnstat_pidfile} --config ${vnstat_config}"
 pidfile="${vnstat_pidfile}"
 
 start_precmd=vnstat_startprecmd
@@ -33,7 +32,16 @@ start_precmd=vnstat_startprecmd
 vnstat_startprecmd()
 {
 	if [ ! -e ${pidfile%/*} ]; then
-		install -d -o ${vnstat_user} -g ${vnstat_group} ${pidfile%/*}
+		install -d -o ${vnstat_user} -g ${vnstat_group} ${pidfile%/*};
+	fi
+
+	dbdir=$(grep "^DatabaseDir" ${vnstat_config} | awk 'BEGIN{FS="\042"}{print $2}')
+	if [ ! -d ${dbdir} ]; then
+		install -d -o ${vnstat_user} -g ${vnstat_group} ${dbdir};
+	fi
+
+	if [ ! -d "/var/run/vnstat" ]; then
+		install -d -o ${vnstat_user} -g ${vnstat_group} /var/run/vnstat;
 	fi
 }