diff options
author | Doug Barton <dougb@FreeBSD.org> | 2009-07-15 16:56:10 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2009-07-15 16:56:10 +0000 |
commit | 0175383f0a1f8b78ed514778532f0467a8ccc6dc (patch) | |
tree | 4c98b621f22bb861a40c6493c6ed7517f295f7f3 /ftp | |
parent | - Chase security/gpgme update. (diff) |
Fix a few "bad example" problems in the rc.d scripts that have been
propogated by copy and paste.
1. Primarily the "empty variable" default assignment, which is mostly
${name}_flags="", but fix a few others as well.
2. Where they are not already documented, add the existence of the _flags
(or other deleted empties) option to the comments, and in some cases add
comments from scratch.
3. Replace things that look like:
prefix=%%PREFIX%%
command=${prefix}/sbin/foo
to just use %%PREFIX%%. In many cases the $prefix variable is only used
once, and in some cases it is not used at all.
4. In a few cases remove ${name}_flags from command_args
5. Remove a long-stale comment about putting the port's rc.d script in
/etc/rc.d (which is no longer necessary).
No PORTREVISION bumps because all of these changes are noops.
Notes
Notes:
svn path=/head/; revision=237892
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/bsdftpd-ssl/files/bsdftpd-ssl.in | 2 | ||||
-rw-r--r-- | ftp/frox/files/frox.sh.in | 4 | ||||
-rw-r--r-- | ftp/ftpsesame/files/ftpsesame.sh.in | 2 | ||||
-rw-r--r-- | ftp/moftpd/files/moftpd.in | 3 | ||||
-rw-r--r-- | ftp/proftpd-devel/files/proftpd.sh.in | 4 | ||||
-rw-r--r-- | ftp/proftpd/files/proftpd.sh.in | 4 | ||||
-rw-r--r-- | ftp/vsftpd-ext/files/vsftpd.sh.in | 1 | ||||
-rw-r--r-- | ftp/vsftpd/files/vsftpd.sh.in | 1 | ||||
-rw-r--r-- | ftp/wzdftpd/files/wzdftpd.sh.in | 10 |
9 files changed, 13 insertions, 18 deletions
diff --git a/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in b/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in index 8d5961475b92..b7eebbd26cc7 100644 --- a/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in +++ b/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in @@ -12,6 +12,7 @@ # "-p" options will be added automatically, you should not specify them. Please # see the examples and the ftpd-ssl(8) man page for more information. # +# bsdftpd_ssl_flags="<set as needed>" . %%RC_SUBR%% @@ -26,7 +27,6 @@ stop_postcmd="rm -f /var/run/ftpd.pid" # Set defaults bsdftpd_ssl_enable=${bsdftpd_ssl_enable:-"NO"} -bsdftpd_ssl_flags=${bsdftpd_ssl_flags:-""} # Run the daemon diff --git a/ftp/frox/files/frox.sh.in b/ftp/frox/files/frox.sh.in index b2ce5678859e..fc4152072c92 100644 --- a/ftp/frox/files/frox.sh.in +++ b/ftp/frox/files/frox.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable frox: # -#frox_enable="YES" +# frox_enable="YES" +# frox_flags="<set as needed>" # # See frox(8) for flags # @@ -34,7 +35,6 @@ stop_postcmd() # set defaults frox_enable=${frox_enable:-"NO"} -frox_flags=${frox_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/ftp/ftpsesame/files/ftpsesame.sh.in b/ftp/ftpsesame/files/ftpsesame.sh.in index 7ada9aebe0d6..4fc8c9971f26 100644 --- a/ftp/ftpsesame/files/ftpsesame.sh.in +++ b/ftp/ftpsesame/files/ftpsesame.sh.in @@ -39,8 +39,6 @@ stop_postcmd() # set defaults ftpsesame_enable=${ftpsesame_enable:-"NO"} -ftpsesame_interface=${ftpsesame_interface-""} -ftpsesame_flags=${ftpsesame_flags-""} load_rc_config $name command_args=${ftpsesame_interface:+"-i ${ftpsesame_interface}"} diff --git a/ftp/moftpd/files/moftpd.in b/ftp/moftpd/files/moftpd.in index 6379b96c1879..49c2a706e1d2 100644 --- a/ftp/moftpd/files/moftpd.in +++ b/ftp/moftpd/files/moftpd.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/ftp/moftpd/files/Attic/moftpd.in,v 1.1 2008-12-26 04:32:41 pgollucci Exp $ +# $FreeBSD: /tmp/pcvs/ports/ftp/moftpd/files/Attic/moftpd.in,v 1.2 2009-07-15 16:55:42 dougb Exp $ # # PROVIDE: moftpd @@ -31,7 +31,6 @@ required_files=%%PREFIX%%/etc/moftpd.conf load_rc_config $name [ -z "$moftpd_enable" ] && moftpd_enable="NO" -[ -z "$moftpd_flags" ] && moftpd_flags="" [ -z "$moftpdlimits_enable" ] && moftpdlimits_enable="NO" [ -z "$moftpdlimits_args" ] && moftpdlimits_args="-e -C daemon" diff --git a/ftp/proftpd-devel/files/proftpd.sh.in b/ftp/proftpd-devel/files/proftpd.sh.in index 5e72d10cfb88..362a2d37f6a0 100644 --- a/ftp/proftpd-devel/files/proftpd.sh.in +++ b/ftp/proftpd-devel/files/proftpd.sh.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable proftpd: # -#proftpd_enable="YES" +# proftpd_enable="YES" +# proftpd_flags="<set as needed>" # # See proftpd(8) for flags # @@ -35,7 +36,6 @@ stop_postcmd() # set defaults proftpd_enable=${proftpd_enable:-"NO"} -proftpd_flags=${proftpd_flags:-""} extra_commands="reload" diff --git a/ftp/proftpd/files/proftpd.sh.in b/ftp/proftpd/files/proftpd.sh.in index 5e72d10cfb88..362a2d37f6a0 100644 --- a/ftp/proftpd/files/proftpd.sh.in +++ b/ftp/proftpd/files/proftpd.sh.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable proftpd: # -#proftpd_enable="YES" +# proftpd_enable="YES" +# proftpd_flags="<set as needed>" # # See proftpd(8) for flags # @@ -35,7 +36,6 @@ stop_postcmd() # set defaults proftpd_enable=${proftpd_enable:-"NO"} -proftpd_flags=${proftpd_flags:-""} extra_commands="reload" diff --git a/ftp/vsftpd-ext/files/vsftpd.sh.in b/ftp/vsftpd-ext/files/vsftpd.sh.in index 3ce7bb15982f..53d137b67a4b 100644 --- a/ftp/vsftpd-ext/files/vsftpd.sh.in +++ b/ftp/vsftpd-ext/files/vsftpd.sh.in @@ -27,7 +27,6 @@ rcvar=`set_rcvar` load_rc_config "$name" : ${vsftpd_enable:="NO"} -: ${vsftpd_flags:=""} command="%%PREFIX%%/libexec/$name" required_files="%%PREFIX%%/etc/$name.conf" diff --git a/ftp/vsftpd/files/vsftpd.sh.in b/ftp/vsftpd/files/vsftpd.sh.in index 3ce7bb15982f..53d137b67a4b 100644 --- a/ftp/vsftpd/files/vsftpd.sh.in +++ b/ftp/vsftpd/files/vsftpd.sh.in @@ -27,7 +27,6 @@ rcvar=`set_rcvar` load_rc_config "$name" : ${vsftpd_enable:="NO"} -: ${vsftpd_flags:=""} command="%%PREFIX%%/libexec/$name" required_files="%%PREFIX%%/etc/$name.conf" diff --git a/ftp/wzdftpd/files/wzdftpd.sh.in b/ftp/wzdftpd/files/wzdftpd.sh.in index 25a14fc945ec..ca4dc35cb034 100644 --- a/ftp/wzdftpd/files/wzdftpd.sh.in +++ b/ftp/wzdftpd/files/wzdftpd.sh.in @@ -9,18 +9,18 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% +# Add the following lines to /etc/rc.conf to enable wzdftpd +# wzdftpd_enable="YES" +# wzdftpd_flags="<set as needed>" wzdftpd_enable=${wzdftpd_enable:-"NO"} # Enable wzdftpd -wzdftpd_program="${prefix}/sbin/wzdftpd" # Location of wzdftpd -wzdftpd_flags=${wzdftpd_flags:-""} # Flags to wzdftpd . %%RC_SUBR%% name="wzdftpd" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" -required_files="${prefix}/etc/wzd.cfg" +command="%%PREFIX%%/sbin/${name}" +required_files="%%PREFIX%%/etc/wzd.cfg" load_rc_config $name run_rc_command "$1" |