diff options
author | dougb <dougb@FreeBSD.org> | 2011-05-15 02:49:17 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2011-05-15 02:49:17 +0000 |
commit | d4eae248fc3499866ff557806dc95e19f9c41643 (patch) | |
tree | 41e2f7bdfeea9edb4e6eedfd70e9de4929e5ef02 | |
parent | c6b86ccb25cd0028406167283ff431a3267900fc (diff) | |
download | FreeBSD-ports-d4eae248fc3499866ff557806dc95e19f9c41643.zip FreeBSD-ports-d4eae248fc3499866ff557806dc95e19f9c41643.tar.gz |
Remove painful examples of foo="", with particular prejudice against
constructions that parse out to [ -z "$foo" ] && foo=""
These are bad examples that get copied and pasted into new code, so the
hope is that with less bad examples there will be less need for me to
bring this up in review.
In a few of these files all that were changed were comments so that next
time I search for these patterns I won't trip on the file for no reason.
In a few places, add $FreeBSD$
No functional changes, so no PORTREVISION bumps
108 files changed, 94 insertions, 176 deletions
diff --git a/astro/gpsd/files/gpsd.in b/astro/gpsd/files/gpsd.in index afc7f75..a926cb3 100644 --- a/astro/gpsd/files/gpsd.in +++ b/astro/gpsd/files/gpsd.in @@ -56,8 +56,6 @@ load_rc_config $name # Set defaults : ${gpsd_enable:="NO"} -: ${gpsd_flags:=""} -: ${gpsd_devices:=""} : ${gpxlogger_enable:="NO"} : ${gpxlogger_flags:="-i 600"} : ${gpxlogger_logdir:="/var/log"} diff --git a/audio/aureal-kmod/files/aureal.in b/audio/aureal-kmod/files/aureal.in index 09cf9b9..d826a6a 100644 --- a/audio/aureal-kmod/files/aureal.in +++ b/audio/aureal-kmod/files/aureal.in @@ -31,7 +31,6 @@ stop_cmd="aureal_stop" load_rc_config $name : ${aureal_enable="NO"} -: ${aureal_card=""} : ${aureal_viakx133fix="NO"} aureal_detect() diff --git a/audio/murmur/files/murmur.in b/audio/murmur/files/murmur.in index 7b8b034..185730e 100644 --- a/audio/murmur/files/murmur.in +++ b/audio/murmur/files/murmur.in @@ -20,7 +20,6 @@ # Set some defaults : ${murmur_enable="NO"} : ${murmur_user="murmur"} -: ${murmur_flags=""} name=murmur rcvar=${name}_enable diff --git a/databases/cego/files/cego.in b/databases/cego/files/cego.in index 737d865..c4b09cf 100644 --- a/databases/cego/files/cego.in +++ b/databases/cego/files/cego.in @@ -27,7 +27,6 @@ command="%%PREFIX%%/bin/cego" : ${cego_enable="NO"} : ${cego_conf="%%PREFIX%%/cego"} : ${cego_root="%%PREFIX%%/cego"} -: ${cego_tablespc=""} : ${cego_user="%%USER%%"} flags="--mode=daemon" diff --git a/databases/couchdb/files/couchdb.in b/databases/couchdb/files/couchdb.in index dea224b..31ba39b 100644 --- a/databases/couchdb/files/couchdb.in +++ b/databases/couchdb/files/couchdb.in @@ -33,7 +33,6 @@ load_rc_config $name command="%%PREFIX%%/bin/${name}" pidfile="/var/run/${name}/${name}.pid" etcdir="%%PREFIX%%/etc/${name}" -respawn="" if [ "$couchdb_respawn" -gt 0 ] then diff --git a/databases/drizzle/files/drizzle-server.sh.in b/databases/drizzle/files/drizzle-server.sh.in index 04ab20a..aeeedef 100644 --- a/databases/drizzle/files/drizzle-server.sh.in +++ b/databases/drizzle/files/drizzle-server.sh.in @@ -34,7 +34,6 @@ load_rc_config $name : ${drizzle_limits="NO"} : ${drizzle_dbdir="/var/db/drizzle"} : ${drizzle_log="${drizzle_dbdir}/`/bin/hostname`.log"} -: ${drizzle_args=""} drizzle_user="%%USERS%%" drizzle_limits_args="-e -U ${drizzle_user}" diff --git a/databases/mariadb-client/files/mysql-server.in b/databases/mariadb-client/files/mysql-server.in index eb7abb9..37af223 100644 --- a/databases/mariadb-client/files/mysql-server.in +++ b/databases/mariadb-client/files/mysql-server.in @@ -30,7 +30,6 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" diff --git a/databases/mariadb-scripts/files/mysql-server.in b/databases/mariadb-scripts/files/mysql-server.in index eb7abb9..37af223 100644 --- a/databases/mariadb-scripts/files/mysql-server.in +++ b/databases/mariadb-scripts/files/mysql-server.in @@ -30,7 +30,6 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" diff --git a/databases/mariadb-server/files/mysql-server.in b/databases/mariadb-server/files/mysql-server.in index eb7abb9..37af223 100644 --- a/databases/mariadb-server/files/mysql-server.in +++ b/databases/mariadb-server/files/mysql-server.in @@ -30,7 +30,6 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" diff --git a/databases/mariadb/files/mysql-server.in b/databases/mariadb/files/mysql-server.in index eb7abb9..37af223 100644 --- a/databases/mariadb/files/mysql-server.in +++ b/databases/mariadb/files/mysql-server.in @@ -30,7 +30,6 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" diff --git a/databases/mysql-proxy/files/mysql-proxy.in b/databases/mysql-proxy/files/mysql-proxy.in index 79704eb..0d904ab 100644 --- a/databases/mysql-proxy/files/mysql-proxy.in +++ b/databases/mysql-proxy/files/mysql-proxy.in @@ -39,7 +39,7 @@ load_rc_config $name : ${mysql_proxy_address=":4040"} : ${mysql_proxy_backend_addresses="127.0.0.1:3306"} : ${mysql_proxy_pid_file="/var/run/mysql-proxy.pid"} -proxy_backend_addresses="" + for addr in ${mysql_proxy_backend_addresses}; do proxy_backend_addresses="${proxy_backend_addresses} --proxy-backend-addresses=${addr}" done diff --git a/databases/mysql323-server/files/mysql-server.sh.in b/databases/mysql323-server/files/mysql-server.sh.in index fbb17f8..e1e46e8 100644 --- a/databases/mysql323-server/files/mysql-server.sh.in +++ b/databases/mysql323-server/files/mysql-server.sh.in @@ -30,7 +30,6 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" diff --git a/databases/mysql40-server/files/mysql-server.sh.in b/databases/mysql40-server/files/mysql-server.sh.in index d99e529..e9c5265 100644 --- a/databases/mysql40-server/files/mysql-server.sh.in +++ b/databases/mysql40-server/files/mysql-server.sh.in @@ -30,7 +30,6 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" diff --git a/databases/mysql41-server/files/mysql-server.sh.in b/databases/mysql41-server/files/mysql-server.sh.in index a7b8858..1484247 100644 --- a/databases/mysql41-server/files/mysql-server.sh.in +++ b/databases/mysql41-server/files/mysql-server.sh.in @@ -30,7 +30,6 @@ load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_args=""} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" diff --git a/databases/redis/files/redis.sh.in b/databases/redis/files/redis.sh.in index 30d006b..0e232f7 100644 --- a/databases/redis/files/redis.sh.in +++ b/databases/redis/files/redis.sh.in @@ -30,6 +30,5 @@ required_files="${config_file}" load_rc_config "$name" : ${redis_enable="NO"} : ${redis_user="%%REDIS_USER%%"} -: ${redis_flags=""} run_rc_command "$1" diff --git a/databases/slony1/files/slon.sh.in b/databases/slony1/files/slon.sh.in index 4557a70..c2f1113 100644 --- a/databases/slony1/files/slon.sh.in +++ b/databases/slony1/files/slon.sh.in @@ -24,7 +24,6 @@ procname="%%PREFIX%%/bin/slon" # From global rc.conf(5); if unset, set them here [ -z "$slon_enable" ] && slon_enable="NO" -[ -z "$slon_profiles" ] && slon_profiles="" configfile_path="%%PREFIX%%/etc/${name}.conf" command_args="-f ${configfile_path}" diff --git a/databases/slony1v2/files/slon.sh.in b/databases/slony1v2/files/slon.sh.in index 4557a70..c2f1113 100644 --- a/databases/slony1v2/files/slon.sh.in +++ b/databases/slony1v2/files/slon.sh.in @@ -24,7 +24,6 @@ procname="%%PREFIX%%/bin/slon" # From global rc.conf(5); if unset, set them here [ -z "$slon_enable" ] && slon_enable="NO" -[ -z "$slon_profiles" ] && slon_profiles="" configfile_path="%%PREFIX%%/etc/${name}.conf" command_args="-f ${configfile_path}" diff --git a/devel/p4d/files/p4d.sh.in b/devel/p4d/files/p4d.sh.in index e8129bd..020ed98 100644 --- a/devel/p4d/files/p4d.sh.in +++ b/devel/p4d/files/p4d.sh.in @@ -37,7 +37,6 @@ load_rc_config $name : ${p4d_port="1666"} : ${p4d_debug="server=3"} : ${p4d_log="%%P4LOG%%"} -: ${p4d_args=""} command="%%PREFIX%%/sbin/p4d" command_args="-r ${p4d_root} -p ${p4d_port} -v ${p4d_debug} -L ${p4d_log} -d ${p4d_args} > /dev/null 2>&1 &" diff --git a/devel/p4ftpd/files/p4ftpd.sh.in b/devel/p4ftpd/files/p4ftpd.sh.in index 35b70b1..064889b 100644 --- a/devel/p4ftpd/files/p4ftpd.sh.in +++ b/devel/p4ftpd/files/p4ftpd.sh.in @@ -37,7 +37,6 @@ load_rc_config $name : ${p4ftpd_port="1666"} : ${p4ftpd_debug="4"} : ${p4ftpd_log="%%P4LOG%%"} -: ${p4ftpd_args=""} command="%%PREFIX%%/sbin/p4ftpd" command_args="-l ${p4ftpd_listen} -p ${p4ftpd_port} -v ${p4ftpd_debug} -L ${p4ftpd_log} -d -u p4admin ${p4ftpd_args} > /dev/null 2>&1 &" diff --git a/devel/p4p/files/p4p.sh.in b/devel/p4p/files/p4p.sh.in index 59e111e..83babd4 100644 --- a/devel/p4p/files/p4p.sh.in +++ b/devel/p4p/files/p4p.sh.in @@ -40,7 +40,6 @@ load_rc_config $name : ${p4p_target="perforce:1666"} : ${p4p_debug="server=3"} : ${p4p_log="%%P4LOG%%"} -: ${p4p_args=""} command="%%PREFIX%%/sbin/p4p" command_args="-r ${p4p_cache} -p ${p4p_port} -t ${p4p_target} -v ${p4p_debug} -L ${p4p_log} -d ${p4p_args} > /dev/null 2>&1 &" diff --git a/devel/p4web/files/p4web.sh.in b/devel/p4web/files/p4web.sh.in index 21e535c..efc69ef 100644 --- a/devel/p4web/files/p4web.sh.in +++ b/devel/p4web/files/p4web.sh.in @@ -38,7 +38,6 @@ load_rc_config $name : ${p4web_listen="8080"} : ${p4web_port="perforce:1666"} : ${p4web_log="%%P4LOG%%"} -: ${p4web_args=""} case ${p4web_mode} in viewer-auth) diff --git a/devel/uppaal/files/uppaal.in b/devel/uppaal/files/uppaal.in index bea45f4..d63a6c5 100644 --- a/devel/uppaal/files/uppaal.in +++ b/devel/uppaal/files/uppaal.in @@ -1,8 +1,5 @@ #!/bin/sh -# Default options if needed. -JAVA_DEF="" - # Force language if LANG is defined. if [ ! -z "$LANG" ]; then LANGLANG=${LANG##*_} diff --git a/emulators/virtualbox-ose-additions/files/vboxservice.in b/emulators/virtualbox-ose-additions/files/vboxservice.in index cdf0cb7..85a235f 100644 --- a/emulators/virtualbox-ose-additions/files/vboxservice.in +++ b/emulators/virtualbox-ose-additions/files/vboxservice.in @@ -21,6 +21,5 @@ command="%%PREFIX%%/sbin/VBoxService" load_rc_config $name : ${vboxservice_enable="NO"} -: ${vboxservice_flags=""} run_rc_command "$1" diff --git a/java/jboss3/files/jboss3.in b/java/jboss3/files/jboss3.in index 8b9a80e..2fb3e34 100644 --- a/java/jboss3/files/jboss3.in +++ b/java/jboss3/files/jboss3.in @@ -28,7 +28,6 @@ procname="%%JAVA%%" [ -z "$%%APP_SHORTNAME%%_enable" ] && %%APP_SHORTNAME%%_enable="NO" [ -z "$%%APP_SHORTNAME%%_flags" ] && %%APP_SHORTNAME%%_flags="-server" -[ -z "$%%APP_SHORTNAME%%_config" ] && %%APP_SHORTNAME%%_config="" %%APP_SHORTNAME%%_start () { diff --git a/java/jboss4/files/jboss4.in b/java/jboss4/files/jboss4.in index 3aa8b32..f63385b 100644 --- a/java/jboss4/files/jboss4.in +++ b/java/jboss4/files/jboss4.in @@ -29,7 +29,6 @@ procname="%%JAVA%%" [ -z "$%%APP_SHORTNAME%%_enable" ] && %%APP_SHORTNAME%%_enable="NO" [ -z "$%%APP_SHORTNAME%%_flags" ] && %%APP_SHORTNAME%%_flags="-server" -[ -z "$%%APP_SHORTNAME%%_config" ] && %%APP_SHORTNAME%%_config="" %%APP_SHORTNAME%%_start () { diff --git a/mail/archivesmtp/files/archivesmtp.in b/mail/archivesmtp/files/archivesmtp.in index 97d8508..6463f1c 100644 --- a/mail/archivesmtp/files/archivesmtp.in +++ b/mail/archivesmtp/files/archivesmtp.in @@ -18,7 +18,6 @@ load_rc_config "$name" : ${archivesmtp_socket="unix:%%SOCKETBASE%%/%%SOCKETDIR%%/mta.sock"} : ${archivesmtp_config="%%PREFIX%%/etc/archivesmtp.conf"} : ${archivesmtp_pidfile="%%SOCKETBASE%%/%%SOCKETDIR%%/run.pid"} -: ${archivesmtp_flags=""} pidfile="${archivesmtp_pidfile}" diff --git a/mail/batv-milter/files/milter-batv.sh.in b/mail/batv-milter/files/milter-batv.sh.in index 852a72a..8fdaee6 100644 --- a/mail/batv-milter/files/milter-batv.sh.in +++ b/mail/batv-milter/files/milter-batv.sh.in @@ -48,13 +48,8 @@ load_rc_config $name # : ${milterbatv_enable="NO"} : ${milterbatv_uid="mailnull"} -: ${milterbatv_profiles=""} : ${milterbatv_cfgfile="%%PREFIX%%/etc/mail/batv-filter.conf"} -: ${milterbatv_socket=""} -: ${milterbatv_domain=""} -: ${milterbatv_allowlist=""} -: ${milterbatv_key=""} # Options other than above can be set with $milterbatv_flags. # see batv-milter documentation for detail. diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in index 0165031..bb3eca8 100644 --- a/mail/dkim-milter/files/milter-dkim.sh.in +++ b/mail/dkim-milter/files/milter-dkim.sh.in @@ -49,14 +49,8 @@ load_rc_config $name # : ${milterdkim_enable="NO"} : ${milterdkim_uid="mailnull"} -: ${milterdkim_profiles=""} : ${milterdkim_cfgfile="%%PREFIX%%/etc/mail/dkim-filter.conf"} -: ${milterdkim_socket=""} -: ${milterdkim_domain=""} -: ${milterdkim_key=""} -: ${milterdkim_selector=""} -: ${milterdkim_alg=""} # Options other than above can be set with $milterdkim_flags. # see dkim-milter documentation for detail. diff --git a/mail/milter-manager/files/milter-manager.in b/mail/milter-manager/files/milter-manager.in index 0697105..d1b77bc 100644 --- a/mail/milter-manager/files/milter-manager.in +++ b/mail/milter-manager/files/milter-manager.in @@ -48,12 +48,10 @@ load_rc_config $name # DO NOT CHANGE THESE DEFAULT VALUES HERE # : ${miltermanager_enable="NO"} -: ${miltermanager_profiles=""} : ${miltermanager_cfgdir="%%PREFIX%%/etc/milter-manager"} : ${miltermanager_uid="mailnull"} : ${miltermanager_gid="mail"} : ${miltermanager_socket_gid="mail"} -: ${miltermanager_socket=""} : ${miltermanager_debug="NO"} # Options other than above can be set with $miltermanager_flags. # see milter-manager documentation for detail. diff --git a/mail/milter-regex/files/milterregex.sh.in b/mail/milter-regex/files/milterregex.sh.in index 74d0a72..0ee9590 100644 --- a/mail/milter-regex/files/milterregex.sh.in +++ b/mail/milter-regex/files/milterregex.sh.in @@ -18,8 +18,9 @@ spooldir=%%SPOOLDIR%% # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# milterregex_flags Flags to milter-regex program + [ -z "$milterregex_enable" ] && milterregex_enable="NO" # Enable milter-regex -# milterregex_flags="" # Flags to milter-regex program . /etc/rc.subr diff --git a/mail/noattach/files/noattach.sh.in b/mail/noattach/files/noattach.sh.in index 4e32b95..c11bd36 100644 --- a/mail/noattach/files/noattach.sh.in +++ b/mail/noattach/files/noattach.sh.in @@ -17,10 +17,11 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# noattach_flags Flags to noattach + noattach_enable=${noattach_enable:-"NO"} # Enable noattach noattach_pidfile=${noattach_pidfile:-"/var/run/noattach.pid"} # Path to pidfile noattach_socket=${noattach_socket:-"/var/run/noattach"} # Path to socket -# noattach_flags="" # Flags to noattach . /etc/rc.subr diff --git a/mail/opendkim/files/milter-opendkim.in b/mail/opendkim/files/milter-opendkim.in index f075bf6..a21f95e 100644 --- a/mail/opendkim/files/milter-opendkim.in +++ b/mail/opendkim/files/milter-opendkim.in @@ -51,14 +51,8 @@ load_rc_config $name # : ${milteropendkim_enable="NO"} : ${milteropendkim_uid="mailnull"} -: ${milteropendkim_profiles=""} : ${milteropendkim_cfgfile="%%PREFIX%%/etc/mail/opendkim.conf"} -: ${milteropendkim_socket=""} -: ${milteropendkim_domain=""} -: ${milteropendkim_key=""} -: ${milteropendkim_selector=""} -: ${milteropendkim_alg=""} # Options other than above can be set with $milteropendkim_flags. # see dkim-milter documentation for detail. diff --git a/mail/postfix25/files/postfix.sh.in b/mail/postfix25/files/postfix.sh.in index 3fc9d1d..44aa542 100644 --- a/mail/postfix25/files/postfix.sh.in +++ b/mail/postfix25/files/postfix.sh.in @@ -28,7 +28,6 @@ load_rc_config $name : ${postfix_enable="NO"} : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"} : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"} -: ${postfix_flags=""} start_cmd=${name}_start stop_cmd=${name}_stop diff --git a/mail/qmail/files/qmail-smtpd.rcNG b/mail/qmail/files/qmail-smtpd.rcNG index 56c1716..4497bf4 100644 --- a/mail/qmail/files/qmail-smtpd.rcNG +++ b/mail/qmail/files/qmail-smtpd.rcNG @@ -1,4 +1,6 @@ #!/bin/sh + +# $FreeBSD$ # # PROVIDE: qmailsmtpd # REQUIRE: LOGIN cleanvar @@ -8,6 +10,8 @@ # security/checkpassword or security checkpassword-pam). # # Note: tcpserver can be found in the sysutils/ucspi-tcp package. +# +# qmailsmtpd_checkpassword could be set to e.g. /usr/local/bin/checkpassword-pam . /etc/rc.subr @@ -24,7 +28,6 @@ load_rc_config $name : ${qmailsmtpd_port="smtp"} : ${qmailsmtpd_smtpd="/var/qmail/bin/qmail-smtpd"} : ${qmailsmtpd_fqdn=`hostname`} -: ${qmailsmtpd_checkpassword=""} # e.g. /usr/local/bin/checkpassword-pam : ${qmailsmtpd_checksubprogram="/usr/bin/true"} qmailsmtpd_start() { diff --git a/mail/sa-utils/files/sa-utils.in b/mail/sa-utils/files/sa-utils.in index 49472b9..77a88ec 100644 --- a/mail/sa-utils/files/sa-utils.in +++ b/mail/sa-utils/files/sa-utils.in @@ -65,11 +65,8 @@ fi : ${daily_sa_enable="YES"} : ${daily_sa_quiet="NO"} -: ${daily_sa_update_flags=""} : ${daily_sa_compile="%%SACOMPILE%%"} -: ${daily_sa_compile_flags=""} : ${daily_sa_compile_nice="YES"} -: ${daily_sa_compile_nice_flags=""} : ${daily_sa_restart_spamd="YES"} PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin diff --git a/mail/spamilter/files/spamilter.sh.in b/mail/spamilter/files/spamilter.sh.in index 0a1cde8..8ef4f14 100644 --- a/mail/spamilter/files/spamilter.sh.in +++ b/mail/spamilter/files/spamilter.sh.in @@ -17,8 +17,9 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# spamilter_flags Flags to spamilter + spamilter_enable=${spamilter_enable:-"NO"} # Enable spamilter-milter -# spamilter_flags="" # Flags to spamilter . /etc/rc.subr diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.sh.in index 5183e48..11302be 100644 --- a/mail/vbsfilter/files/vbsfilter.sh.in +++ b/mail/vbsfilter/files/vbsfilter.sh.in @@ -17,9 +17,10 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# vbsfilter_flags Flags to vbsfilter + vbsfilter_enable=${vbsfilter_enable:-"NO"} # Enable vbsfilter-milter vbsfilter_socket=${vbsfilter_socket:-"/var/run/vbsfilter"} # Path to socket -# vbsfilter_flags="" # Flags to vbsfilter . /etc/rc.subr diff --git a/misc/dahdi-kmod/files/dahdi.in b/misc/dahdi-kmod/files/dahdi.in index 484dd24..471a627 100644 --- a/misc/dahdi-kmod/files/dahdi.in +++ b/misc/dahdi-kmod/files/dahdi.in @@ -44,7 +44,6 @@ load_rc_config $name kmod_dir=%%PREFIX%%/lib/dahdi # reverse list -dahdi_modules_unload="" for m in ${dahdi_modules}; do dahdi_modules_unload="$m ${dahdi_modules_unload}" done diff --git a/multimedia/freevo/files/freevo.in b/multimedia/freevo/files/freevo.in index 791033f..5d4f37a 100644 --- a/multimedia/freevo/files/freevo.in +++ b/multimedia/freevo/files/freevo.in @@ -54,7 +54,6 @@ freevo_stop() { [ ${freevo_recordserver_enable} = "YES" ] && su ${freevo_user} -c "${command} --stop recordserver" && msg Stopping freevo recordserver. } -no_msg="" case "$1" in start|faststart|onestart) diff --git a/multimedia/mythtv/files/mythbackend.in b/multimedia/mythtv/files/mythbackend.in index 242b817..6ddc1cf 100644 --- a/multimedia/mythtv/files/mythbackend.in +++ b/multimedia/mythtv/files/mythbackend.in @@ -25,7 +25,6 @@ load_rc_config $name : ${mythbackend_enable="NO"} : ${mythbackend_logfile="/var/log/${name}.log"} -: ${mythbackend_flags=""} command_args="-d -l ${mythbackend_logfile}" diff --git a/net-mgmt/darkstat/files/darkstat.in b/net-mgmt/darkstat/files/darkstat.in index 37b8b43..4669d54 100644 --- a/net-mgmt/darkstat/files/darkstat.in +++ b/net-mgmt/darkstat/files/darkstat.in @@ -17,7 +17,7 @@ # darkstat_dir="/var/run/darkstat" # darkstat_pidname="darkstat.pid" # darkstat_dropuser="nobody" -# darkstat_flags="" +# darkstat_flags # # - examples: [ --no-promisc ] [ --no-dns ] [ -p port ] # [ -b bindaddr ] [ -f filter ] [ -l network/netmask ] diff --git a/net-mgmt/macroscope/files/macroscope.in b/net-mgmt/macroscope/files/macroscope.in index 9bffc75..4b6e4ad 100644 --- a/net-mgmt/macroscope/files/macroscope.in +++ b/net-mgmt/macroscope/files/macroscope.in @@ -12,7 +12,7 @@ # macroscope_enable="NO" # set to YES to enable macroscope # # # optional: -# macroscope_flags="" # additional command line arguments +# macroscope_flags # additional command line arguments # . /etc/rc.subr diff --git a/net-mgmt/softflowd/files/softflowd.in b/net-mgmt/softflowd/files/softflowd.in index 9624770..8473007d 100644 --- a/net-mgmt/softflowd/files/softflowd.in +++ b/net-mgmt/softflowd/files/softflowd.in @@ -16,8 +16,8 @@ # softflowd_em1_timeouts="-t maxlife=600" # softflowd_em0_max_states="16000" # softflowd_em1_max_states="17000" -# softflowd_em0_extra_args="" -# softflowd_em1_extra_args="" +# softflowd_em0_extra_args +# softflowd_em1_extra_args . /etc/rc.subr diff --git a/net-mgmt/trafd/files/trafd.in b/net-mgmt/trafd/files/trafd.in index 1bb19ab..b1e2adb 100644 --- a/net-mgmt/trafd/files/trafd.in +++ b/net-mgmt/trafd/files/trafd.in @@ -10,9 +10,9 @@ # # trafd_enable="YES" # trafd_ifaces="fxp0 fxp1 fxp2" -# trafd_flags="" # trafd_log="/var/log/traffic.log" # +# trafd_flags (Set as needed) . /etc/rc.subr diff --git a/net-mgmt/xymon-client/files/xymon-client.sh.in b/net-mgmt/xymon-client/files/xymon-client.sh.in index 2cafdc6..3e46631 100644 --- a/net-mgmt/xymon-client/files/xymon-client.sh.in +++ b/net-mgmt/xymon-client/files/xymon-client.sh.in @@ -13,7 +13,6 @@ rcvar=`set_rcvar` load_rc_config "$name" : ${xymon_client_enable:="NO"} -: ${xymon_client_flags:=""} command="%%PREFIX%%/www/xymon/client/runclient.sh" start_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} start" @@ -23,4 +22,3 @@ reload_cmd="%%PREFIX%%/www/xymon/client/runclient.sh ${xymon_client_flags} resta pidfile="%%PREFIX%%/www/xymon/client/logs/clientlaunch.`hostname`.pid" run_rc_command "$1" -# eof diff --git a/net-p2p/gift/files/giftd.in b/net-p2p/gift/files/giftd.in index 9d45474..6a2d822 100644 --- a/net-p2p/gift/files/giftd.in +++ b/net-p2p/gift/files/giftd.in @@ -16,8 +16,8 @@ giftd_enable="${giftd_enable-NO}" giftd_flags="-d -q" -# giftd_user="" -# giftd_local_dir="" +# giftd_user +# giftd_local_dir . /etc/rc.subr diff --git a/net-p2p/i2p/files/i2p.sh.in b/net-p2p/i2p/files/i2p.sh.in index e3fd12f..58161b0 100644 --- a/net-p2p/i2p/files/i2p.sh.in +++ b/net-p2p/i2p/files/i2p.sh.in @@ -11,9 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable i2p: # -#i2p_enable="YES" -#i2p_user="" -# +# i2p_enable="YES" +# i2p_user . /etc/rc.subr diff --git a/net-p2p/mldonkey/files/kill_mldonkey b/net-p2p/mldonkey/files/kill_mldonkey index 71c40bc..f3f8078 100644 --- a/net-p2p/mldonkey/files/kill_mldonkey +++ b/net-p2p/mldonkey/files/kill_mldonkey @@ -34,7 +34,7 @@ # like this: # #MLNETUSER="admin" -#MLNETPASS="" +#MLNETPASS="pass" #MLNETHOST="127.0.0.1" #MLNETPORT="4080" diff --git a/net-p2p/mldonkey/files/mlnet.in b/net-p2p/mldonkey/files/mlnet.in index 2874c2b..71a9614 100644 --- a/net-p2p/mldonkey/files/mlnet.in +++ b/net-p2p/mldonkey/files/mlnet.in @@ -11,11 +11,10 @@ # # Add the following lines to /etc/rc.conf to enable mlnet: # -#mlnet_enable="YES" -#mlnet_user="" -#mlnet_flags="" -#mlnet_logfile="" -# +# mlnet_enable="YES" +# mlnet_user="user" +# mlnet_logfile="file" +# mlnet_flags (Set as needed) . /etc/rc.subr diff --git a/net/dhcprelay/files/dhcprelay.in b/net/dhcprelay/files/dhcprelay.in index 456cf0e..b693b72 100644 --- a/net/dhcprelay/files/dhcprelay.in +++ b/net/dhcprelay/files/dhcprelay.in @@ -9,8 +9,8 @@ # # dhcprelay_enable="YES" # -# dhcprelay_server="" # dhcprelay server(s) -# dhcprelay_ifaces="" # ethernet interface(s) +# dhcprelay_server dhcprelay server(s) +# dhcprelay_ifaces ethernet interface(s) . /etc/rc.subr diff --git a/net/ifstated/files/ifstated.in b/net/ifstated/files/ifstated.in index b141c55..8da538b 100644 --- a/net/ifstated/files/ifstated.in +++ b/net/ifstated/files/ifstated.in @@ -48,8 +48,6 @@ command_args="-p \"${pidfile}\"" load_rc_config $name : ${ifstated_enable:="NO"} -: ${ifstated_flags:=""} -: ${ifstated_profiles:=""} if [ -n "$2" ] then diff --git a/net/iodine/files/iodined.in b/net/iodine/files/iodined.in index bf9c600..afaedc0 100644 --- a/net/iodine/files/iodined.in +++ b/net/iodine/files/iodined.in @@ -29,8 +29,6 @@ command=%%PREFIX%%/sbin/${name} load_rc_config $name : ${iodined_enable="NO"} -: ${iodined_password=""} -: ${iodined_domain=""} : ${iodined_addr="172.16.0.1"} : ${iodined_flags="-u _iodined -t /var/empty"} diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.in b/net/isc-dhcp31-server/files/isc-dhcrelay.in index 950ff5e..faa26e0 100644 --- a/net/isc-dhcp31-server/files/isc-dhcrelay.in +++ b/net/isc-dhcp31-server/files/isc-dhcrelay.in @@ -12,9 +12,9 @@ # override these variables in /etc/rc.conf dhcrelay_enable=${dhcrelay_enable:-"NO"} -# dhcrelay_flags="" # command option(s) -# dhcrelay_servers="" # dhcrelay server(s) -# dhcrelay_ifaces="" # ethernet interface(s) +# dhcrelay_flags # command option(s) +# dhcrelay_servers # dhcrelay server(s) +# dhcrelay_ifaces # ethernet interface(s) dhcrelay_precmd () { diff --git a/net/linknx/files/linknx.in b/net/linknx/files/linknx.in index 1c1e3fe..be89e80 100644 --- a/net/linknx/files/linknx.in +++ b/net/linknx/files/linknx.in @@ -29,7 +29,6 @@ start_precmd="linknx_precmd" : ${linknx_enable:="NO"} : ${linknx_console:="/var/log/linknx.log"} -: ${linknx_config:=""} : ${linknx_pidfile:="/var/run/linknx.pid"} : ${linknx_flags:="--pid-file=${linknx_pidfile}"} diff --git a/net/lvwimax/files/lvwimax.in b/net/lvwimax/files/lvwimax.in index be612c2..6dc904c 100644 --- a/net/lvwimax/files/lvwimax.in +++ b/net/lvwimax/files/lvwimax.in @@ -24,7 +24,6 @@ lvwimax_enable=${lvwimax_enable-"NO"} lvwimax_mac_address=${lvwimax_mac_address-"00:00:00:00:00:00"} command=%%PREFIX%%/sbin/${name} -command_args="" start_precmd="lvwimax_prestart" start_postcmd="lvwimax_poststart" diff --git a/net/mediaproxy/files/mediaproxy.sh.in b/net/mediaproxy/files/mediaproxy.sh.in index e20cf16..002b29e 100644 --- a/net/mediaproxy/files/mediaproxy.sh.in +++ b/net/mediaproxy/files/mediaproxy.sh.in @@ -1,4 +1,6 @@ #!/bin/sh + +# $FreeBSD$ # # mediaproxy starts and stops the SER MediaProxy server diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in index babab88..596a5e1 100644 --- a/net/openldap24-server/files/slapd.sh.in +++ b/net/openldap24-server/files/slapd.sh.in @@ -50,7 +50,6 @@ fi : ${slapd_owner="ldap:ldap"} : ${slapd_sockets_mode="666"} : ${slapd_cn_config="NO"} -: ${slapd_krb5_ktname=""} command="%%PREFIX%%/libexec/slapd" pidfile="%%LDAP_RUN_DIR%%/slapd.pid" diff --git a/net/quagga/files/quagga.sh.in b/net/quagga/files/quagga.sh.in index 7e6cc3d..ceb71b6 100644 --- a/net/quagga/files/quagga.sh.in +++ b/net/quagga/files/quagga.sh.in @@ -1,6 +1,7 @@ #!/bin/sh -# +# $FreeBSD$ +# # PROVIDE: quagga # REQUIRE: netif routing # KEYWORD: nojail @@ -81,8 +82,6 @@ load_rc_config $name : ${quagga_enable="NO"} : ${quagga_flags="-d"} : ${quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"} -: ${quagga_extralibs_path=""} -: ${quagga_wait_for=""} quagga_cmd=$1 diff --git a/net/quagga/files/watchquagga.sh.in b/net/quagga/files/watchquagga.sh.in index d8b04e0..cb0d1bf 100644 --- a/net/quagga/files/watchquagga.sh.in +++ b/net/quagga/files/watchquagga.sh.in @@ -1,15 +1,15 @@ #!/bin/sh -# +# $FreeBSD$ +# # PROVIDE: watchquagga # REQUIRE: NETWORKING quagga - # # Add the following line to /etc/rc.conf to enable quagga: -#watchquagga_enable="YES" +# watchquagga_enable="YES" # # You may also wish to use the following variables to fine-tune startup: -#watchquagga_flags="" +# watchquagga_flags # # diff --git a/net/scribe/files/scribe.in b/net/scribe/files/scribe.in index a65ba65..8acd455 100644 --- a/net/scribe/files/scribe.in +++ b/net/scribe/files/scribe.in @@ -18,7 +18,6 @@ stop_postcmd=scribe_cleanup load_rc_config "$name" : ${scribe_enable="NO"} -: ${scribe_flags=""} scribe_start() { diff --git a/net/siproxd/files/siproxd.sh.in b/net/siproxd/files/siproxd.sh.in index 7ba06f5..a0b635d 100644 --- a/net/siproxd/files/siproxd.sh.in +++ b/net/siproxd/files/siproxd.sh.in @@ -13,7 +13,7 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # siproxd_enable="YES" -# siproxd_flags="" # Flags to siproxd program +# siproxd_flags Flags to siproxd program siproxd_enable=${siproxd_enable:-"NO"} # Enable siproxd diff --git a/net/spread/files/spread.sh.in b/net/spread/files/spread.sh.in index a523e29..11663d4 100644 --- a/net/spread/files/spread.sh.in +++ b/net/spread/files/spread.sh.in @@ -22,7 +22,7 @@ name=spread rcvar=`set_rcvar` command="%%PREFIX%%/sbin/spread" -command_args="" + pidfile=/var/run/${name}.pid required_files=%%PREFIX%%/etc/${name}.conf diff --git a/net/spread4/files/spread.sh.in b/net/spread4/files/spread.sh.in index dda54b6..4e010a6 100644 --- a/net/spread4/files/spread.sh.in +++ b/net/spread4/files/spread.sh.in @@ -21,7 +21,7 @@ name=spread rcvar=`set_rcvar` command="%%PREFIX%%/sbin/spread" -command_args="" + pidfile=/var/run/${name}.pid required_files=%%PREFIX%%/etc/${name}.conf diff --git a/net/sslh/files/sslh.in b/net/sslh/files/sslh.in index 5af3889..6ed1088 100644 --- a/net/sslh/files/sslh.in +++ b/net/sslh/files/sslh.in @@ -21,7 +21,7 @@ # sslh_sshtimeout="2" # sslh_listening="0.0.0.0:8443" # sslh_uid="nobody" -# sslh_flags="" +# sslh_flags sslh_setfib() { sysctl net.fibs >/dev/null 2>&1 || return 0 diff --git a/net/wired-tracker/files/trackerd.sh.in b/net/wired-tracker/files/trackerd.sh.in index bf60acf..124775c 100644 --- a/net/wired-tracker/files/trackerd.sh.in +++ b/net/wired-tracker/files/trackerd.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: trackerd # REQUIRE: # @@ -22,6 +24,4 @@ load_rc_config $name : ${trackerd_enable="NO"} -command_args="" - run_rc_command "$1" diff --git a/net/wired/files/wired.sh.in b/net/wired/files/wired.sh.in index cd85bb3..9a0f629 100644 --- a/net/wired/files/wired.sh.in +++ b/net/wired/files/wired.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: wired # REQUIRE: # @@ -22,6 +24,4 @@ load_rc_config $name : ${wired_enable="NO"} -command_args="" - run_rc_command "$1" diff --git a/net/xorp-devel/files/xorp.in b/net/xorp-devel/files/xorp.in index 1f4fcce..03b32a1 100644 --- a/net/xorp-devel/files/xorp.in +++ b/net/xorp-devel/files/xorp.in @@ -11,9 +11,10 @@ # Add the following lines to /etc/rc.conf to enable xorp: # -#xorp_enable="YES" -#xorp_conf="%%PREFIX%%/etc/xorp.conf.sample" +# xorp_enable="YES" +# xorp_conf="%%PREFIX%%/etc/xorp.conf.sample" # +# xorp_flags (Set as needed) . /etc/rc.subr @@ -24,7 +25,6 @@ load_rc_config $name : ${xorp_enable="NO"} : ${xorp_conf="%%PREFIX%%/etc/xorp.conf"} -: ${xorp_flags=""} : ${xorp_rtrmgr_pidfile="/var/run/xorp_rtrmgr.pid"} : ${xorp_rtrmgr_logfile="/var/log/xorp_rtrmgr.log"} : ${xorp_rtrmgr_poll_enable=true} diff --git a/security/openvpn-beta/files/openvpn.sh.in b/security/openvpn-beta/files/openvpn.sh.in index 8fa3bac..a60af9a 100644 --- a/security/openvpn-beta/files/openvpn.sh.in +++ b/security/openvpn-beta/files/openvpn.sh.in @@ -44,10 +44,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in index 8fa3bac..a60af9a 100644 --- a/security/openvpn-devel/files/openvpn.sh.in +++ b/security/openvpn-devel/files/openvpn.sh.in @@ -44,10 +44,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.sh.in index 9a081ed..6e88286 100644 --- a/security/openvpn/files/openvpn.sh.in +++ b/security/openvpn/files/openvpn.sh.in @@ -45,10 +45,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in index 894b405..b80fe15 100644 --- a/security/openvpn20/files/openvpn.sh.in +++ b/security/openvpn20/files/openvpn.sh.in @@ -44,10 +44,10 @@ # /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME # # NAME_enable="NO" # set to YES to enable openvpn -# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap" +# NAME_if= # driver(s) to load, set to "tun", "tap" or "tun tap" # # # optional: -# NAME_flags="" # additional command line arguments +# NAME_flags= # additional command line arguments # NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file # NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory # diff --git a/security/p5-openxpki-deployment/files/openxpki.sh.in b/security/p5-openxpki-deployment/files/openxpki.sh.in index 70374060..b79847e6 100644 --- a/security/p5-openxpki-deployment/files/openxpki.sh.in +++ b/security/p5-openxpki-deployment/files/openxpki.sh.in @@ -13,8 +13,9 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# openxpki_flags (Set as needed) + openxpki_enable="${openxpki_enable-NO}" -# openxpki_flags="" openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid" case "$1" in diff --git a/security/sancp/files/sancp.in b/security/sancp/files/sancp.in index 80bc186..8e67d5e 100644 --- a/security/sancp/files/sancp.in +++ b/security/sancp/files/sancp.in @@ -1,6 +1,7 @@ #!/bin/sh -# +# $FreeBSD$ +# # PROVIDE: sancp # REQUIRE: DAEMON # BEFORE: LOGIN @@ -73,7 +74,6 @@ load_rc_config $name : ${sancp_enable="NO"} : ${sancp_flags="-D"} : ${sancp_conf="%%PREFIX%%/etc/sancp.conf"} -: ${sancp_interface=""} command_args="-c ${sancp_conf} -i ${sancp_interface}" diff --git a/sysutils/ganglia-monitor-core/files/ganglia.sh.in b/sysutils/ganglia-monitor-core/files/ganglia.sh.in index 9207440..724415f 100644 --- a/sysutils/ganglia-monitor-core/files/ganglia.sh.in +++ b/sysutils/ganglia-monitor-core/files/ganglia.sh.in @@ -18,7 +18,7 @@ gmetasnap_enable="${gmetasnap_enable-NO}" gmetasnap_rrddir="/var/db/ganglia/rrds" gmetasnap_snapdir="/var/db/ganglia/snaps" gmetasnap_snapname="snap" -# gmetasnap_flags="" +# gmetasnap_flags= gmetasnap_command="%%PREFIX%%/sbin/gmetasnap" ### gmond ### diff --git a/sysutils/msyslog/files/msyslogd.sh.in b/sysutils/msyslog/files/msyslogd.sh.in index ef91504..1cdd90a 100644 --- a/sysutils/msyslog/files/msyslogd.sh.in +++ b/sysutils/msyslog/files/msyslogd.sh.in @@ -13,7 +13,7 @@ # # Yes, here you can pass arguments to daemon # -# msyslogd_flags="" +# msyslogd_flags= # . /etc/rc.subr diff --git a/sysutils/p5-Tail-Stat/files/tstatd.in b/sysutils/p5-Tail-Stat/files/tstatd.in index fa985d6..72ddd33 100644 --- a/sysutils/p5-Tail-Stat/files/tstatd.in +++ b/sysutils/p5-Tail-Stat/files/tstatd.in @@ -30,7 +30,6 @@ rcvar=${name}_enable load_rc_config ${name} : ${tstatd_enable="NO"} -: ${tstatd_profiles=""} command=%%PREFIX%%/bin/tstatd diff --git a/sysutils/puppet/files/puppetmaster.in b/sysutils/puppet/files/puppetmaster.in index 9cf60b5..1f48c01 100644 --- a/sysutils/puppet/files/puppetmaster.in +++ b/sysutils/puppet/files/puppetmaster.in @@ -21,7 +21,6 @@ load_rc_config "${name}" : ${puppetmaster_enable="NO"} : ${puppetmaster_rundir="%%PUPPET_RUNDIR%%"} : ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"} -: ${puppetmaster_mongrel_ports=""} command_interpreter="%%PREFIX%%/bin/ruby18" command="%%PREFIX%%/bin/puppet" diff --git a/sysutils/radmind/files/radmind.sh.in b/sysutils/radmind/files/radmind.sh.in index 97b889f..d0b0a3d 100644 --- a/sysutils/radmind/files/radmind.sh.in +++ b/sysutils/radmind/files/radmind.sh.in @@ -26,7 +26,6 @@ name=radmind rcvar=`set_rcvar` command=%%PREFIX%%/sbin/radmind -command_args="" required_files=%%RADMIND_BASE_DIR%%/config # set defaults diff --git a/sysutils/sec/files/sec.in b/sysutils/sec/files/sec.in index 79a0fe4..5e51e53 100644 --- a/sysutils/sec/files/sec.in +++ b/sysutils/sec/files/sec.in @@ -39,7 +39,6 @@ load_rc_config "${name}" [ -z "${sec_enable}" ] && sec_enable="NO" [ -z "${sec_flags}" ] && sec_flags="-log=/var/log/sec.log" [ -z "${sec_configfile}" ] && sec_configfile="%%PREFIX%%/etc/sec.conf" -[ -z "${sec_instances}" ] && sec_instances="" sec_checkconfig() { if [ -z $instance ] diff --git a/sysutils/torque/files/pbs_mom.sh.in b/sysutils/torque/files/pbs_mom.sh.in index 79f1c78..54ce272 100644 --- a/sysutils/torque/files/pbs_mom.sh.in +++ b/sysutils/torque/files/pbs_mom.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: pbs_mom # REQUIRE: # @@ -22,6 +24,4 @@ load_rc_config $name : ${pbs_mom_enable="NO"} -command_args="" - run_rc_command "$1" diff --git a/sysutils/torque/files/pbs_sched.sh.in b/sysutils/torque/files/pbs_sched.sh.in index 58ee013..817d8a3 100644 --- a/sysutils/torque/files/pbs_sched.sh.in +++ b/sysutils/torque/files/pbs_sched.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: pbs_sched # REQUIRE: pbs_server # @@ -22,6 +24,4 @@ load_rc_config $name : ${pbs_sched_enable="NO"} -command_args="" - run_rc_command "$1" diff --git a/sysutils/torque/files/pbs_server.sh.in b/sysutils/torque/files/pbs_server.sh.in index 946e346..be367c7 100644 --- a/sysutils/torque/files/pbs_server.sh.in +++ b/sysutils/torque/files/pbs_server.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: pbs_server # REQUIRE: # @@ -22,6 +24,4 @@ load_rc_config $name : ${pbs_server_enable="NO"} -command_args="" - run_rc_command "$1" diff --git a/textproc/pootle/files/pootle.sh.in b/textproc/pootle/files/pootle.sh.in index d98bb95..569f855 100644 --- a/textproc/pootle/files/pootle.sh.in +++ b/textproc/pootle/files/pootle.sh.in @@ -33,7 +33,6 @@ load_rc_config $name : ${pootle_enable="NO"} : ${pootle_user="%%POOTLEUSER%%"} : ${pootle_logdir="%%POOTLELOGDIR%%"} -: ${pootle_flags=""} if [ -n "${pootle_logdir}" ]; then pootle_stdout="${pootle_logdir}/access.log" diff --git a/www/amphetadesk/files/amphetadesk.in b/www/amphetadesk/files/amphetadesk.in index f014684..af525de 100644 --- a/www/amphetadesk/files/amphetadesk.in +++ b/www/amphetadesk/files/amphetadesk.in @@ -12,8 +12,8 @@ # Add the following lines to /etc/rc.conf to enable amphetadesk: # #amphetadesk_enable="YES" -#amphetadesk_user="" -#amphetadesk_pidfile="" +#amphetadesk_user= +#amphetadesk_pidfile= # . /etc/rc.subr @@ -25,7 +25,6 @@ procname="%%PERL%%" load_rc_config "${name}" : ${amphetadesk_enable="NO"} -: ${amphetadesk_user=""} if [ -n "${amphetadesk_user}" ]; then eval realpath ~${amphetadesk_user} >/dev/null 2>&1 && diff --git a/www/apache13-modssl/files/apache.in b/www/apache13-modssl/files/apache.in index 82eaf7e..d971e1d 100644 --- a/www/apache13-modssl/files/apache.in +++ b/www/apache13-modssl/files/apache.in @@ -42,7 +42,6 @@ pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/apache/httpd.conf [ -z "$apache_enable" ] && apache_enable="NO" -[ -z "$apache_profiles" ] && apache_profiles="" [ -z "$apache_flags" ] && apache_flags="-DSSL" [ -z "$apachelimits_enable" ] && apachelimits_enable="NO" [ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" diff --git a/www/cntlm/files/cntlm.in b/www/cntlm/files/cntlm.in index b0de641..6dc19f6 100644 --- a/www/cntlm/files/cntlm.in +++ b/www/cntlm/files/cntlm.in @@ -21,7 +21,6 @@ load_rc_config $name : ${cntlm_enable="NO"} : ${cntlm_config="%%{PREFIX}/etc/cntlm.conf"} -: ${cntlm_flags=""} : ${cntlm_user="nobody"} pidfile=/var/run/${name}.pid diff --git a/www/fcgiwrap/files/fcgiwrap.in b/www/fcgiwrap/files/fcgiwrap.in index 39bc208..f3d9fb1 100644 --- a/www/fcgiwrap/files/fcgiwrap.in +++ b/www/fcgiwrap/files/fcgiwrap.in @@ -19,7 +19,7 @@ # this could also be: # - tcp:[ipv4_addr]:port (for ipv4) # - tcp6:[ipv6_addr]:port (for ipv6) -# fcgiwrap_flags="" +# fcgiwrap_flags= # Use fcgiwrap_user to run fcgiwrap as user fcgiwrap_setfib() { diff --git a/www/httptunnel/files/htc.in b/www/httptunnel/files/htc.in index 9dc0c43..bfd0a1a 100644 --- a/www/httptunnel/files/htc.in +++ b/www/httptunnel/files/htc.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: htc # REQUIRE: LOGIN # @@ -47,12 +49,6 @@ load_rc_config $name : ${htc_enable="NO"} : ${htc_user="httptunnel"} -: ${htc_port=""} -: ${htc_forward=""} -: ${htc_device=""} - -: ${htc_proxy=""} -: ${htc_proxyauth=""} : ${htc_proxybuffer="1K"} : ${htc_browser="Mozilla/4.7 [en] (X11; I; Linux 2.2.12 i386)"} : ${htc_flags="-S"} diff --git a/www/httptunnel/files/hts.in b/www/httptunnel/files/hts.in index 7dcbb1d..2ccae46 100644 --- a/www/httptunnel/files/hts.in +++ b/www/httptunnel/files/hts.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: hts # REQUIRE: LOGIN # @@ -41,8 +43,6 @@ load_rc_config $name : ${hts_user="httptunnel"} : ${hts_port="8888"} -: ${hts_device=""} -: ${hts_forward=""} [ -n "$hts_device" ] && command_args="-d $hts_device" [ -n "$hts_forward" ] && command_args="-F $hts_forward" diff --git a/www/hudson/files/hudson.sh.in b/www/hudson/files/hudson.sh.in index 225b06a..67e3d2b 100644 --- a/www/hudson/files/hudson.sh.in +++ b/www/hudson/files/hudson.sh.in @@ -52,7 +52,6 @@ load_rc_config "${name}" : ${hudson_home="%%HUDSON_HOME%%"} : ${hudson_args="--webroot=${hudson_home}/war --httpListenAddress=127.0.0.1 --httpPort=8180 --ajp13ListenAddress=127.0.0.1 --ajp13Port=8009 --prefix=/hudson"} : ${hudson_java_home="%%JAVA_HOME%%"} -: ${hudson_java_opts=""} : ${hudson_user="%%HUDSON_USER%%"} : ${hudson_group="%%HUDSON_GROUP%%"} diff --git a/www/lighttpd/files/lighttpd.sh.in b/www/lighttpd/files/lighttpd.sh.in index 6f12a3e..193c0c9 100644 --- a/www/lighttpd/files/lighttpd.sh.in +++ b/www/lighttpd/files/lighttpd.sh.in @@ -34,9 +34,7 @@ rcvar=`set_rcvar` load_rc_config $name : ${lighttpd_enable="NO"} -: ${lighttpd_conf=""} : ${lighttpd_pidfile="/var/run/${name}.pid"} -: ${lighttpd_instances=""} # Compatibility for old configuration file location deprecated_conf= diff --git a/www/shellinabox/files/shellinaboxd.in b/www/shellinabox/files/shellinaboxd.in index 7f35e71..5e00b70 100644 --- a/www/shellinabox/files/shellinaboxd.in +++ b/www/shellinabox/files/shellinaboxd.in @@ -20,9 +20,9 @@ # shellinaboxd_group="%%GROUPS%%" # shellinaboxd_port="4200" # shellinaboxd_certdir="%%ETCDIR%%" -# shellinaboxd_certfile="" +# shellinaboxd_certfile= # Example: shellinaboxd_certfile="/your/cert.pem" -# shellinaboxd_flags="" +# shellinaboxd_flags= shellinaboxd_setfib() { sysctl net.fibs >/dev/null 2>&1 || return 0 diff --git a/www/spawn-fcgi/files/spawn-fcgi.sh.in b/www/spawn-fcgi/files/spawn-fcgi.sh.in index 34177b4..414f250 100644 --- a/www/spawn-fcgi/files/spawn-fcgi.sh.in +++ b/www/spawn-fcgi/files/spawn-fcgi.sh.in @@ -1,10 +1,19 @@ #!/bin/sh -# +# $FreeBSD$ +# # PROVIDE: spawn_fcgi # REQUIRE: %%REQUIRE%% # BEFORE: LOGIN # KEYWORD: shutdown +# +# Optional settings: +# +# spawn_fcgi_app_args +# spawn_fcgi_chroot_dir +# spawn_fcgi_bindsocket +# spawn_fcgi_web_server_addrs +# spawn_fcgi_allowed_env . /etc/rc.subr @@ -15,19 +24,14 @@ load_rc_config $name : ${spawn_fcgi_enable="NO"} : ${spawn_fcgi_app="%%LOCALBASE%%/bin/php-cgi"} -: ${spawn_fcgi_app_args=""} : ${spawn_fcgi_pidfile="/var/run/spawn-fcgi.pid"} : ${spawn_fcgi_username="www"} : ${spawn_fcgi_groupname="www"} -: ${spawn_fcgi_chroot_dir=""} : ${spawn_fcgi_bindaddr="127.0.0.1"} : ${spawn_fcgi_bindport="9000"} -: ${spawn_fcgi_bindsocket=""} : ${spawn_fcgi_bindsocket_mode="0777"} : ${spawn_fcgi_children="5"} : ${spawn_fcgi_max_requests="1000"} -: ${spawn_fcgi_web_server_addrs=""} -: ${spawn_fcgi_allowed_env=""} : ${spawn_fcgi_path_env="/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin"} if [ -z "${spawn_fcgi_bindsocket}" ]; then diff --git a/www/varnish/files/varnishd.in b/www/varnish/files/varnishd.in index 93c0704..e238fbe 100644 --- a/www/varnish/files/varnishd.in +++ b/www/varnish/files/varnishd.in @@ -64,7 +64,6 @@ load_rc_config ${name} : ${varnishd_listen:=":80"} : ${varnishd_admin:="localhost:81"} : ${varnishd_backend:="localhost:8080"} -: ${varnishd_config:=""} : ${varnishd_storage:="file,/tmp,50%"} : ${varnishd_hash:="classic,16383"} : ${varnishd_user:="www"} diff --git a/www/varnish2/files/varnishd.in b/www/varnish2/files/varnishd.in index 93c0704..e238fbe 100644 --- a/www/varnish2/files/varnishd.in +++ b/www/varnish2/files/varnishd.in @@ -64,7 +64,6 @@ load_rc_config ${name} : ${varnishd_listen:=":80"} : ${varnishd_admin:="localhost:81"} : ${varnishd_backend:="localhost:8080"} -: ${varnishd_config:=""} : ${varnishd_storage:="file,/tmp,50%"} : ${varnishd_hash:="classic,16383"} : ${varnishd_user:="www"} diff --git a/www/webredirect/files/webredirect.sh.in b/www/webredirect/files/webredirect.sh.in index 999662c..eb21675 100644 --- a/www/webredirect/files/webredirect.sh.in +++ b/www/webredirect/files/webredirect.sh.in @@ -1,14 +1,14 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: webredirect # REQUIRE: DAEMON - # # Add the following lines to /etc/rc.conf to enable webredirect: # -# webredirect_enable="YES" # YES or NO (default) -# webredirect_flags="" # webredirect command line flags -# +# webredirect_enable="YES" # YES or NO (default) +# webredirect_flags # webredirect command line flags . /etc/rc.subr diff --git a/www/zope210/files/zeo210.in b/www/zope210/files/zeo210.in index 41ba088..b654a3f 100644 --- a/www/zope210/files/zeo210.in +++ b/www/zope210/files/zeo210.in @@ -57,7 +57,6 @@ restart_cmd="zeo210_restart" load_rc_config $name : ${zeo210_enable="NO"} -: ${zeo210_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope210/files/zope210.in b/www/zope210/files/zope210.in index 1ff6999..149781d 100644 --- a/www/zope210/files/zope210.in +++ b/www/zope210/files/zope210.in @@ -56,7 +56,6 @@ restart_cmd="zope210_restart" load_rc_config $name : ${zope210_enable="NO"} -: ${zope210_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope211/files/zeo211.in b/www/zope211/files/zeo211.in index 1e1396d..6d8d593 100644 --- a/www/zope211/files/zeo211.in +++ b/www/zope211/files/zeo211.in @@ -57,7 +57,6 @@ restart_cmd="zeo211_restart" load_rc_config $name : ${zeo211_enable="NO"} -: ${zeo211_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope211/files/zope211.in b/www/zope211/files/zope211.in index cb099a83..dc32d86 100644 --- a/www/zope211/files/zope211.in +++ b/www/zope211/files/zope211.in @@ -55,7 +55,6 @@ restart_cmd="zope211_restart" load_rc_config $name : ${zope211_enable="NO"} -: ${zope211_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope213/files/zeo211.in b/www/zope213/files/zeo211.in index 1e1396d..6d8d593 100644 --- a/www/zope213/files/zeo211.in +++ b/www/zope213/files/zeo211.in @@ -57,7 +57,6 @@ restart_cmd="zeo211_restart" load_rc_config $name : ${zeo211_enable="NO"} -: ${zeo211_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope213/files/zope211.in b/www/zope213/files/zope211.in index cb099a83..dc32d86 100644 --- a/www/zope213/files/zope211.in +++ b/www/zope213/files/zope211.in @@ -55,7 +55,6 @@ restart_cmd="zope211_restart" load_rc_config $name : ${zope211_enable="NO"} -: ${zope211_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope28/files/zeo28.sh.in b/www/zope28/files/zeo28.sh.in index 4f033ed..4346c03 100644 --- a/www/zope28/files/zeo28.sh.in +++ b/www/zope28/files/zeo28.sh.in @@ -57,7 +57,6 @@ restart_cmd="zeo28_restart" load_rc_config $name : ${zeo28_enable="NO"} -: ${zeo28_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope28/files/zope28.sh.in b/www/zope28/files/zope28.sh.in index adb1c1a..f9a127e 100644 --- a/www/zope28/files/zope28.sh.in +++ b/www/zope28/files/zope28.sh.in @@ -56,7 +56,6 @@ restart_cmd="zope28_restart" load_rc_config $name : ${zope28_enable="NO"} -: ${zope28_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope29/files/zeo29.sh.in b/www/zope29/files/zeo29.sh.in index 9c5510a..c96f0c6 100644 --- a/www/zope29/files/zeo29.sh.in +++ b/www/zope29/files/zeo29.sh.in @@ -57,7 +57,6 @@ restart_cmd="zeo29_restart" load_rc_config $name : ${zeo29_enable="NO"} -: ${zeo29_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope29/files/zope29.sh.in b/www/zope29/files/zope29.sh.in index 3245091..23d3e62 100644 --- a/www/zope29/files/zope29.sh.in +++ b/www/zope29/files/zope29.sh.in @@ -56,7 +56,6 @@ restart_cmd="zope29_restart" load_rc_config $name : ${zope29_enable="NO"} -: ${zope29_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope3/files/zeo3.sh.in b/www/zope3/files/zeo3.sh.in index 9dbb591..74bc669 100644 --- a/www/zope3/files/zeo3.sh.in +++ b/www/zope3/files/zeo3.sh.in @@ -56,7 +56,6 @@ restart_cmd="zeo3_restart" load_rc_config $name : ${zeo3_enable="NO"} -: ${zeo3_instances=""} cmd="$1" [ $# -gt 0 ] && shift diff --git a/www/zope3/files/zope3.sh.in b/www/zope3/files/zope3.sh.in index a9c1185..a54a1d1 100644 --- a/www/zope3/files/zope3.sh.in +++ b/www/zope3/files/zope3.sh.in @@ -56,7 +56,6 @@ restart_cmd="zope3_restart" load_rc_config $name : ${zope3_enable="NO"} -: ${zope3_instances=""} cmd="$1" [ $# -gt 0 ] && shift |