From owner-cvs-all@FreeBSD.ORG Fri May 14 18:57:00 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 654A1106566C for ; Fri, 14 May 2010 18:57:00 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 0A9218FC0A for ; Fri, 14 May 2010 18:56:59 +0000 (UTC) Received: (qmail 8501 invoked by uid 399); 14 May 2010 18:56:58 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 14 May 2010 18:56:58 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4BED9CF8.2060304@FreeBSD.org> Date: Fri, 14 May 2010 11:56:56 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.9) Gecko/20100330 Thunderbird/3.0.4 MIME-Version: 1.0 To: Pav Lucistnik References: <201005141242.o4ECgodC092259@repoman.freebsd.org> In-Reply-To: <201005141242.o4ECgodC092259@repoman.freebsd.org> X-Enigmail-Version: 1.0.1 OpenPGP: id=1A1ABC84 Content-Type: multipart/mixed; boundary="------------000900040400040001090006" Cc: cvs-ports@FreeBSD.org, Anton Vinokurov , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/net-mgmt/netams Makefile distinfo pkg-descr pkg-plist ports/net-mgmt/netams/files netams.in pkg-message.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2010 18:57:00 -0000 This is a multi-part message in MIME format. --------------000900040400040001090006 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Anton, Please consider and test the attached patch to simplify the rc.d script. Changing from a custom start_cmd to simply using command_args is a good idea for a few reasons, the rest of the changes are minor optimizations. hth, Doug On 05/14/10 05:42, Pav Lucistnik wrote: > pav 2010-05-14 12:42:50 UTC > > FreeBSD ports repository > > Modified files: > net-mgmt/netams Makefile distinfo pkg-descr > net-mgmt/netams/files netams.in pkg-message.in > Added files: > net-mgmt/netams pkg-plist > Log: > - Update to 3.4.5 > > PR: ports/143410 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=143410 > Submitted by: Anton Vinokurov (maintainer) > > Revision Changes Path > 1.26 +56 -205 ports/net-mgmt/netams/Makefile > 1.17 +3 -3 ports/net-mgmt/netams/distinfo > 1.6 +9 -8 ports/net-mgmt/netams/files/netams.in > 1.3 +8 -5 ports/net-mgmt/netams/files/pkg-message.in > 1.5 +1 -1 ports/net-mgmt/netams/pkg-descr > 1.9 +70 -0 ports/net-mgmt/netams/pkg-plist (new) > > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/net-mgmt/netams/Makefile.diff?&r1=1.25&r2=1.26&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/net-mgmt/netams/distinfo.diff?&r1=1.16&r2=1.17&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/net-mgmt/netams/files/netams.in.diff?&r1=1.5&r2=1.6&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/net-mgmt/netams/files/pkg-message.in.diff?&r1=1.2&r2=1.3&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/net-mgmt/netams/pkg-descr.diff?&r1=1.4&r2=1.5&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/net-mgmt/netams/pkg-plist > -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ --------------000900040400040001090006 Content-Type: text/plain; name="netams.in.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="netams.in.diff" Index: netams.in =================================================================== RCS file: /home/pcvs/ports/net-mgmt/netams/files/netams.in,v retrieving revision 1.6 diff -u -r1.6 netams.in --- netams.in 14 May 2010 12:42:50 -0000 1.6 +++ netams.in 14 May 2010 18:53:36 -0000 @@ -1,10 +1,10 @@ #!/bin/sh -# $FreeBSD: ports/net-mgmt/netams/files/netams.in,v 1.6 2010/05/14 12:42:50 pav Exp $ +# $FreeBSD$ +# # PROVIDE: netams -# REQUIRE: NETWORKING +# REQUIRE: NETWORKING mysql # KEYWORD: shutdown -# REQUIRE: mysql # Define these netams_* variables in one of these files: # /etc/rc.conf @@ -15,13 +15,9 @@ # Set it to "YES" to enable netams. # netams_config (str): Custom configuration file to be passed # to netams. +# netams_pidfile (str): Path to the pid file (/var/run/netams.pid) # # DO NOT CHANGE THESE DEFAULT VALUES HERE -# -netams_enable=${netams_enable-"NO"} -netams_config=${netams_config-"%%PREFIX%%/etc/netams/netams.conf"} - -netams_pidfile="/var/run/netams.pid" . /etc/rc.subr @@ -31,8 +27,12 @@ load_rc_config $name -pidfile="${netams_pidfile}" +netams_enable=${netams_enable:-"NO"} +netams_config=${netams_config:-"%%PREFIX%%/etc/netams/netams.conf"} +pidfile="${netams_pidfile:-/var/run/netams.pid}" + +required_files="$netams_config" -start_cmd="echo \"Starting ${name}.\"; ${command} -lf ${netams_config} > /dev/null" +command_args="-lf ${netams_config} > /dev/null" run_rc_command "$1" --------------000900040400040001090006--