From owner-svn-ports-head@FreeBSD.ORG Thu Jun 27 20:40:36 2013 Return-Path: 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 90D423A8; Thu, 27 Jun 2013 20:40:36 +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 8349E1DF8; Thu, 27 Jun 2013 20:40:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RKeaUi071411; Thu, 27 Jun 2013 20:40:36 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RKeZuJ071407; Thu, 27 Jun 2013 20:40:35 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201306272040.r5RKeZuJ071407@svn.freebsd.org> From: Mark Felder Date: Thu, 27 Jun 2013 20:40:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321902 - in head: . net/vnstat 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 20:40:36 -0000 Author: feld Date: Thu Jun 27 20:40:35 2013 New Revision: 321902 URL: http://svnweb.freebsd.org/changeset/ports/321902 Log: - Add rc script - Add vnstat to UIDs and GIDs PR: ports/179271 Approved by: crees (mentor) Added: head/net/vnstat/files/vnstat.in (contents, props changed) Modified: head/GIDs head/UIDs head/net/vnstat/Makefile (contents, props changed) Modified: head/GIDs ============================================================================== --- head/GIDs Thu Jun 27 20:16:01 2013 (r321901) +++ head/GIDs Thu Jun 27 20:40:35 2013 (r321902) @@ -135,6 +135,7 @@ xymon:*:280: prelude:*:281: spread:*:282: devmon:*:283: +vnstat:*:284: backuppc:*:300: _sphinx:*:312: dkfilter:*:325: Modified: head/UIDs ============================================================================== --- head/UIDs Thu Jun 27 20:16:01 2013 (r321901) +++ head/UIDs Thu Jun 27 20:40:35 2013 (r321902) @@ -143,6 +143,7 @@ xymon:*:280:280::0:0:Xymon Monitor:/none prelude:*:281:281::0:0:Prelude user:/nonexistent:/usr/sbin/nologin spread:*:282:282::0:0:Spread user:/nonexistent:/usr/sbin/nologin devmon:*:283:283::0:0:devmon monitor:/nonexistent:/usr/sbin/nologin +vnstat:*:284:284::0:0:vnStat Network Monitor:/nonexistent:/usr/sbin/nologin backuppc:*:300:300::0:0:BackupPC pseudo-user:/nonexistent:/usr/sbin/nologin _sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin dkfilter:*:325:325::0:0:DK Filter Owner:/nonexistent:/usr/sbin/nologin Modified: head/net/vnstat/Makefile ============================================================================== --- head/net/vnstat/Makefile Thu Jun 27 20:16:01 2013 (r321901) +++ head/net/vnstat/Makefile Thu Jun 27 20:40:35 2013 (r321902) @@ -3,7 +3,7 @@ PORTNAME= vnstat PORTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://humdi.net/vnstat/ \ http://mirror.mcx2.org/ @@ -15,11 +15,18 @@ MAKE_ARGS= CC="${CC}" CFLAGS="-I${LOCALB LDFLAGS="-L${LOCALBASE}/lib" INSTALL_TARGET= bsdinstall +USE_RC_SUBR= vnstat + +USERS= vnstat +GROUPS= vnstat + MAN1= vnstat.1 vnstatd.1 MAN5= vnstat.conf.5 MANCOMPRESSED= yes PORTDOCS= README INSTALL_BSD UPGRADE vnstat-cron SUB_FILES= pkg-message +SUB_LIST= USERS=${USERS} \ + GROUPS=${GROUPS} # will compile with image output OPTIONS_DEFINE= GUI DOCS @@ -34,7 +41,7 @@ PLIST_FILES= bin/vnstat \ etc/vnstat.conf.sample .if ${PORT_OPTIONS:MGUI} -LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd PLIST_SUB+= GUI="" MAN1+= vnstati.1 .else Added: head/net/vnstat/files/vnstat.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/vnstat/files/vnstat.in Thu Jun 27 20:40:35 2013 (r321902) @@ -0,0 +1,40 @@ +#!/bin/sh +# Created by: Mark Felder +# $FreeBSD$ + +# PROVIDE: vnstat +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# 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 + +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%%"} + +command="%%PREFIX%%/bin/vnstatd" +command_args="${vnstat_flags}" +pidfile="${vnstat_pidfile}" + +start_precmd=vnstat_startprecmd + +vnstat_startprecmd() +{ + if [ ! -e ${pidfile%/*} ]; then + install -d -o ${vnstat_user} -g ${vnstat_group} ${pidfile%/*} + fi +} + +run_rc_command "$1"