cvs commit: ports/security/scanlogd Makefile ports/security/scanlogd/files scanlogd.in scanlogd.sh

[Roman Bogorodskiy]

  Doug Barton wrote:

> Roman Bogorodskiy wrote:
> > novel       2009-08-21 18:55:12 UTC
> > 
> >   FreeBSD ports repository
> > 
> >   Modified files:
> >     security/scanlogd    Makefile 
> >   Added files:
> >     security/scanlogd/files scanlogd.in 
> >   Removed files:
> >     security/scanlogd/files scanlogd.sh 
> >   Log:
> >   Improve USE_RC_SUBR usage.
> >   
> >   PR:             136849  http://www.FreeBSD.org/cgi/query-pr.cgi?pr=136849
> >   Submitted by:   pgollucci
> >   
> >   Revision  Changes    Path
> >   1.9       +3 -9      ports/security/scanlogd/Makefile
> >   1.1       +25 -0     ports/security/scanlogd/files/scanlogd.in (new)
> >   1.5       +0 -25     ports/security/scanlogd/files/scanlogd.sh (dead)
> > 
> > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/security/scanlogd/Makefile.diff?&r1=1.8&r2=1.9&f=h
> > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/security/scanlogd/files/scanlogd.in
> > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/security/scanlogd/files/scanlogd.sh
> 
> Thanks for committing this improvement. :)  Couple of notes on the
> rc.d script, none of them life-threatening:
> 
> 1. Unless this tool provides services that are needed for logging in,
> "REQUIRE: DAEMON, BEFORE: LOGIN" should be replaced with "REQUIRE:LOGIN"
> 2. The default variable assignment should come after load_rc_config,
> and should use just - instead of :-
> 3. In my last cleanup pass I missed the empty "required_files"
> variable. That should be removed (or filled in, as appropriate).
> 
> As always, more info in
> http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/rc-scripts.html

Hello!

So basically it should look like this:

Index: scanlogd.in
===================================================================
RCS file: /home/pcvs/ports/security/scanlogd/files/scanlogd.in,v
retrieving revision 1.1
diff -u -r1.1 scanlogd.in
--- scanlogd.in	21 Aug 2009 18:55:12 -0000	1.1
+++ scanlogd.in	30 Aug 2009 16:50:21 -0000
@@ -4,22 +4,21 @@
 # $FreeBSD: ports/security/scanlogd/files/scanlogd.in,v 1.1 2009/08/21 18:55:12 novel Exp $
 
 # PROVIDE: scanlogd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable scanlogd:
 # scanlogd_enable="YES"
 # scanlogd_flags="<set as needed>"
 
-scanlogd_enable=${scanlogd_enable:-"NO"}	# Enable scanlogd
-
 . %%RC_SUBR%%
 
 name="scanlogd"
 rcvar=`set_rcvar`
 command="%%PREFIX%%/bin/${name}"
-required_files=""
 
 load_rc_config $name
+
+: ${scanlogd_enable-"NO"}	# Enable scanlogd
+
 run_rc_command "$1"

Is it OK?

Thanks,
Roman Bogorodskiy