aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/antivirus-milter/files/antivirus-milter.sh.in10
-rw-r--r--mail/batv-milter/files/milter-batv.sh.in1
-rw-r--r--mail/courier/files/courier.sh.in4
-rw-r--r--mail/cyrus-imapd2/files/imapd.sh.in12
-rw-r--r--mail/cyrus-imapd22/files/imapd.sh.in12
-rw-r--r--mail/cyrus-imapd23/files/imapd.sh.in12
-rw-r--r--mail/cyrus-imapd24/files/imapd.sh.in12
-rw-r--r--mail/dbmail/files/dbmail-imapd.sh.in4
-rw-r--r--mail/dbmail/files/dbmail-lmtpd.sh.in4
-rw-r--r--mail/dbmail/files/dbmail-pop3d.sh.in4
-rw-r--r--mail/dbmail/files/dbmail-timsieved.sh.in4
-rw-r--r--mail/dbmail20/files/dbmail-imapd.sh.in4
-rw-r--r--mail/dbmail20/files/dbmail-lmtpd.sh.in4
-rw-r--r--mail/dbmail20/files/dbmail-pop3d.sh.in4
-rw-r--r--mail/dbmail21/files/dbmail-imapd.sh.in4
-rw-r--r--mail/dbmail21/files/dbmail-lmtpd.sh.in4
-rw-r--r--mail/dbmail21/files/dbmail-pop3d.sh.in4
-rw-r--r--mail/dbmail21/files/dbmail-timsieved.sh.in4
-rw-r--r--mail/dbmail22/files/dbmail-imapd.sh.in4
-rw-r--r--mail/dbmail22/files/dbmail-lmtpd.sh.in4
-rw-r--r--mail/dbmail22/files/dbmail-pop3d.sh.in4
-rw-r--r--mail/dbmail22/files/dbmail-timsieved.sh.in4
-rw-r--r--mail/dbmail23/files/dbmail-imapd.sh.in4
-rw-r--r--mail/dbmail23/files/dbmail-lmtpd.sh.in4
-rw-r--r--mail/dbmail23/files/dbmail-pop3d.sh.in4
-rw-r--r--mail/dbmail23/files/dbmail-timsieved.sh.in4
-rw-r--r--mail/dkim-milter/files/milter-dkim.sh.in1
-rw-r--r--mail/drac/files/dracd.sh.in1
-rw-r--r--mail/mailscanner-devel/files/mta.in1
-rw-r--r--mail/mailscanner/files/mta.in1
-rw-r--r--mail/milter-regex/files/milterregex.sh.in13
-rw-r--r--mail/noattach/files/noattach.sh.in10
-rw-r--r--mail/perdition/files/perdition.imap4.in2
-rw-r--r--mail/perdition/files/perdition.imap4s.in2
-rw-r--r--mail/perdition/files/perdition.imaps.in2
-rw-r--r--mail/perdition/files/perdition.in4
-rw-r--r--mail/perdition/files/perdition.pop3.in4
-rw-r--r--mail/perdition/files/perdition.pop3s.in4
-rw-r--r--mail/postfix-current/files/postfix.sh.in1
-rw-r--r--mail/postfix23/files/postfix.sh.in1
-rw-r--r--mail/postfix24/files/postfix.sh.in1
-rw-r--r--mail/py-apolicy/files/apolicyd.in7
-rw-r--r--mail/py-ppolicy/files/ppolicyd.sh.in3
-rw-r--r--mail/rbl-milter/files/rblmilter.sh.in4
-rw-r--r--mail/spamd/files/obspamd.in1
-rw-r--r--mail/spamd/files/obspamlogd.in1
-rw-r--r--mail/spamilter/files/spamilter.sh.in12
-rw-r--r--mail/spampd/files/spampd.in2
-rw-r--r--mail/vbsfilter/files/vbsfilter.sh.in8
49 files changed, 79 insertions, 146 deletions
diff --git a/mail/antivirus-milter/files/antivirus-milter.sh.in b/mail/antivirus-milter/files/antivirus-milter.sh.in
index 8d89715ebb31..cee33194de97 100644
--- a/mail/antivirus-milter/files/antivirus-milter.sh.in
+++ b/mail/antivirus-milter/files/antivirus-milter.sh.in
@@ -10,8 +10,6 @@
# KEYWORD: shutdown
#
-prefix=%%PREFIX%%
-
# Define these antivirus_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
@@ -22,14 +20,14 @@ prefix=%%PREFIX%%
antivirus_enable=${antivirus_enable:-"NO"} # Enable antivirus-milter
antivirus_pidfile=${antivirus_pidfile:-"%%ANTIVIRUS%%/run/antivirus.pid"} # Path to pidfile
antivirus_socket=${antivirus_socket:-"%%ANTIVIRUS%%/antivirus.sock"} # Path to socket
-antivirus_flags=${antivirus_flags:-""} # Flags to antivirus
+#antivirus_flags=${antivirus_flags:-""} # Flags to antivirus
. /etc/rc.subr
name="antivirus"
rcvar=`set_rcvar`
-command="${prefix}/libexec/antivirus"
-required_files="${prefix}/etc/antivirus.conf"
+command="%%PREFIX%%/libexec/antivirus"
+required_files="%%PREFIX%%/etc/antivirus.conf"
start_precmd="antivirus_prestart"
stop_postcmd="antivirus_poststop"
@@ -47,5 +45,3 @@ pidfile="${antivirus_pidfile}"
command_args="-p local:${antivirus_socket} ${antivirus_flags}"
run_rc_command "$1"
-
-# eof
diff --git a/mail/batv-milter/files/milter-batv.sh.in b/mail/batv-milter/files/milter-batv.sh.in
index feb81e986357..e9af1bd7ca76 100644
--- a/mail/batv-milter/files/milter-batv.sh.in
+++ b/mail/batv-milter/files/milter-batv.sh.in
@@ -57,7 +57,6 @@ load_rc_config $name
: ${milterbatv_key=""}
# Options other than above can be set with $milterbatv_flags.
# see batv-milter documentation for detail.
-: ${milterbatv_flags=""}
if [ -n "$2" ]; then
profile="$2"
diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.sh.in
index a2ec2e2f7fa4..703fa7abd17a 100644
--- a/mail/courier/files/courier.sh.in
+++ b/mail/courier/files/courier.sh.in
@@ -11,10 +11,6 @@
# REQUIRE: LOGIN courier_authdaemond
# BEFORE: securelevel
# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move courier.sh to /etc/rc.d/courier
prefix="%%PREFIX%%"
exec_prefix="${prefix}"
diff --git a/mail/cyrus-imapd2/files/imapd.sh.in b/mail/cyrus-imapd2/files/imapd.sh.in
index b8dd83bd4a01..489c6301d6c4 100644
--- a/mail/cyrus-imapd2/files/imapd.sh.in
+++ b/mail/cyrus-imapd2/files/imapd.sh.in
@@ -7,12 +7,6 @@
# REQUIRE: DAEMON
# BEFORE: mail
# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
# Define these cyrus_imapd_* variables in one of these files:
# /etc/rc.conf
@@ -22,16 +16,16 @@ prefix=%%PREFIX%%
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd
-#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd
+#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd
[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
. %%RC_SUBR%%
name="cyrus_imapd"
rcvar=`set_rcvar`
-command="${prefix}/cyrus/bin/master"
+command="%%PREFIX%%/cyrus/bin/master"
pidfile="/var/run/cyrus-master.pid"
-required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf"
+required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
stop_postcmd="cyrus_imapd_poststop"
cyrus_imapd_poststop() {
diff --git a/mail/cyrus-imapd22/files/imapd.sh.in b/mail/cyrus-imapd22/files/imapd.sh.in
index b8dd83bd4a01..489c6301d6c4 100644
--- a/mail/cyrus-imapd22/files/imapd.sh.in
+++ b/mail/cyrus-imapd22/files/imapd.sh.in
@@ -7,12 +7,6 @@
# REQUIRE: DAEMON
# BEFORE: mail
# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
# Define these cyrus_imapd_* variables in one of these files:
# /etc/rc.conf
@@ -22,16 +16,16 @@ prefix=%%PREFIX%%
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd
-#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd
+#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd
[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
. %%RC_SUBR%%
name="cyrus_imapd"
rcvar=`set_rcvar`
-command="${prefix}/cyrus/bin/master"
+command="%%PREFIX%%/cyrus/bin/master"
pidfile="/var/run/cyrus-master.pid"
-required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf"
+required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
stop_postcmd="cyrus_imapd_poststop"
cyrus_imapd_poststop() {
diff --git a/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.sh.in
index b8dd83bd4a01..489c6301d6c4 100644
--- a/mail/cyrus-imapd23/files/imapd.sh.in
+++ b/mail/cyrus-imapd23/files/imapd.sh.in
@@ -7,12 +7,6 @@
# REQUIRE: DAEMON
# BEFORE: mail
# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
# Define these cyrus_imapd_* variables in one of these files:
# /etc/rc.conf
@@ -22,16 +16,16 @@ prefix=%%PREFIX%%
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd
-#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd
+#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd
[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
. %%RC_SUBR%%
name="cyrus_imapd"
rcvar=`set_rcvar`
-command="${prefix}/cyrus/bin/master"
+command="%%PREFIX%%/cyrus/bin/master"
pidfile="/var/run/cyrus-master.pid"
-required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf"
+required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
stop_postcmd="cyrus_imapd_poststop"
cyrus_imapd_poststop() {
diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in
index b8dd83bd4a01..489c6301d6c4 100644
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ b/mail/cyrus-imapd24/files/imapd.sh.in
@@ -7,12 +7,6 @@
# REQUIRE: DAEMON
# BEFORE: mail
# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
# Define these cyrus_imapd_* variables in one of these files:
# /etc/rc.conf
@@ -22,16 +16,16 @@ prefix=%%PREFIX%%
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd
-#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd
+#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd
[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
. %%RC_SUBR%%
name="cyrus_imapd"
rcvar=`set_rcvar`
-command="${prefix}/cyrus/bin/master"
+command="%%PREFIX%%/cyrus/bin/master"
pidfile="/var/run/cyrus-master.pid"
-required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf"
+required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
stop_postcmd="cyrus_imapd_poststop"
cyrus_imapd_poststop() {
diff --git a/mail/dbmail/files/dbmail-imapd.sh.in b/mail/dbmail/files/dbmail-imapd.sh.in
index 82505e96d9b0..dce54a82f917 100644
--- a/mail/dbmail/files/dbmail-imapd.sh.in
+++ b/mail/dbmail/files/dbmail-imapd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-imapd:
#
-#dbmail_imapd_enable="YES"
+# dbmail_imapd_enable="YES"
+# dbmail_imapd_flags="<set as needed>"
#
# See dbmail-imapd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail/files/dbmail-lmtpd.sh.in b/mail/dbmail/files/dbmail-lmtpd.sh.in
index f1133f43a70e..e62355064847 100644
--- a/mail/dbmail/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail/files/dbmail-lmtpd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd:
#
-#dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_flags="<set as needed>"
#
# See dbmail-lmtpd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail/files/dbmail-pop3d.sh.in b/mail/dbmail/files/dbmail-pop3d.sh.in
index d787f6a668e7..8df206a0edec 100644
--- a/mail/dbmail/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail/files/dbmail-pop3d.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
#
-#dbmail_pop3d_enable="YES"
+# dbmail_pop3d_enable="YES"
+# dbmail_pop3d_flags="<set as needed>"
#
# See dbmail-pop3d(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail/files/dbmail-timsieved.sh.in b/mail/dbmail/files/dbmail-timsieved.sh.in
index 26b5888cba6d..63a2d5b97cda 100644
--- a/mail/dbmail/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail/files/dbmail-timsieved.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
#
-#dbmail_timsieved_enable="YES"
+# dbmail_timsieved_enable="YES"
+# dbmail_timsieved_flags="<set as needed>"
#
# See dbmail-timsieved(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_timsieved_enable="NO"}
-: ${dbmail_timsieved_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail20/files/dbmail-imapd.sh.in b/mail/dbmail20/files/dbmail-imapd.sh.in
index 82505e96d9b0..dce54a82f917 100644
--- a/mail/dbmail20/files/dbmail-imapd.sh.in
+++ b/mail/dbmail20/files/dbmail-imapd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-imapd:
#
-#dbmail_imapd_enable="YES"
+# dbmail_imapd_enable="YES"
+# dbmail_imapd_flags="<set as needed>"
#
# See dbmail-imapd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail20/files/dbmail-lmtpd.sh.in b/mail/dbmail20/files/dbmail-lmtpd.sh.in
index f1133f43a70e..e62355064847 100644
--- a/mail/dbmail20/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail20/files/dbmail-lmtpd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd:
#
-#dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_flags="<set as needed>"
#
# See dbmail-lmtpd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail20/files/dbmail-pop3d.sh.in b/mail/dbmail20/files/dbmail-pop3d.sh.in
index d787f6a668e7..8df206a0edec 100644
--- a/mail/dbmail20/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail20/files/dbmail-pop3d.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
#
-#dbmail_pop3d_enable="YES"
+# dbmail_pop3d_enable="YES"
+# dbmail_pop3d_flags="<set as needed>"
#
# See dbmail-pop3d(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail21/files/dbmail-imapd.sh.in b/mail/dbmail21/files/dbmail-imapd.sh.in
index 82505e96d9b0..dce54a82f917 100644
--- a/mail/dbmail21/files/dbmail-imapd.sh.in
+++ b/mail/dbmail21/files/dbmail-imapd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-imapd:
#
-#dbmail_imapd_enable="YES"
+# dbmail_imapd_enable="YES"
+# dbmail_imapd_flags="<set as needed>"
#
# See dbmail-imapd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail21/files/dbmail-lmtpd.sh.in b/mail/dbmail21/files/dbmail-lmtpd.sh.in
index f1133f43a70e..e62355064847 100644
--- a/mail/dbmail21/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail21/files/dbmail-lmtpd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd:
#
-#dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_flags="<set as needed>"
#
# See dbmail-lmtpd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail21/files/dbmail-pop3d.sh.in b/mail/dbmail21/files/dbmail-pop3d.sh.in
index 21bc97377b8b..132177736ce5 100644
--- a/mail/dbmail21/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail21/files/dbmail-pop3d.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
#
-#dbmail_pop3d_enable="YES"
+# dbmail_pop3d_enable="YES"
+# dbmail_pop3d_flags="<set as needed>"
#
# See dbmail-pop3d(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail21/files/dbmail-timsieved.sh.in b/mail/dbmail21/files/dbmail-timsieved.sh.in
index 26b5888cba6d..63a2d5b97cda 100644
--- a/mail/dbmail21/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail21/files/dbmail-timsieved.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
#
-#dbmail_timsieved_enable="YES"
+# dbmail_timsieved_enable="YES"
+# dbmail_timsieved_flags="<set as needed>"
#
# See dbmail-timsieved(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_timsieved_enable="NO"}
-: ${dbmail_timsieved_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.sh.in
index 82505e96d9b0..dce54a82f917 100644
--- a/mail/dbmail22/files/dbmail-imapd.sh.in
+++ b/mail/dbmail22/files/dbmail-imapd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-imapd:
#
-#dbmail_imapd_enable="YES"
+# dbmail_imapd_enable="YES"
+# dbmail_imapd_flags="<set as needed>"
#
# See dbmail-imapd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.sh.in
index f1133f43a70e..e62355064847 100644
--- a/mail/dbmail22/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail22/files/dbmail-lmtpd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd:
#
-#dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_flags="<set as needed>"
#
# See dbmail-lmtpd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.sh.in
index d787f6a668e7..8df206a0edec 100644
--- a/mail/dbmail22/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail22/files/dbmail-pop3d.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
#
-#dbmail_pop3d_enable="YES"
+# dbmail_pop3d_enable="YES"
+# dbmail_pop3d_flags="<set as needed>"
#
# See dbmail-pop3d(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-timsieved.sh.in b/mail/dbmail22/files/dbmail-timsieved.sh.in
index 26b5888cba6d..63a2d5b97cda 100644
--- a/mail/dbmail22/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail22/files/dbmail-timsieved.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
#
-#dbmail_timsieved_enable="YES"
+# dbmail_timsieved_enable="YES"
+# dbmail_timsieved_flags="<set as needed>"
#
# See dbmail-timsieved(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_timsieved_enable="NO"}
-: ${dbmail_timsieved_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail23/files/dbmail-imapd.sh.in b/mail/dbmail23/files/dbmail-imapd.sh.in
index 82505e96d9b0..dce54a82f917 100644
--- a/mail/dbmail23/files/dbmail-imapd.sh.in
+++ b/mail/dbmail23/files/dbmail-imapd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-imapd:
#
-#dbmail_imapd_enable="YES"
+# dbmail_imapd_enable="YES"
+# dbmail_imapd_flags="<set as needed>"
#
# See dbmail-imapd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_imapd_enable="NO"}
-: ${dbmail_imapd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail23/files/dbmail-lmtpd.sh.in b/mail/dbmail23/files/dbmail-lmtpd.sh.in
index f1133f43a70e..e62355064847 100644
--- a/mail/dbmail23/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail23/files/dbmail-lmtpd.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd:
#
-#dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_enable="YES"
+# dbmail_lmtpd_flags="<set as needed>"
#
# See dbmail-lmtpd(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_lmtpd_enable="NO"}
-: ${dbmail_lmtpd_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail23/files/dbmail-pop3d.sh.in b/mail/dbmail23/files/dbmail-pop3d.sh.in
index d787f6a668e7..8df206a0edec 100644
--- a/mail/dbmail23/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail23/files/dbmail-pop3d.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
#
-#dbmail_pop3d_enable="YES"
+# dbmail_pop3d_enable="YES"
+# dbmail_pop3d_flags="<set as needed>"
#
# See dbmail-pop3d(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_pop3d_enable="NO"}
-: ${dbmail_pop3d_flags=""}
run_rc_command "$1"
diff --git a/mail/dbmail23/files/dbmail-timsieved.sh.in b/mail/dbmail23/files/dbmail-timsieved.sh.in
index 26b5888cba6d..63a2d5b97cda 100644
--- a/mail/dbmail23/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail23/files/dbmail-timsieved.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
#
-#dbmail_timsieved_enable="YES"
+# dbmail_timsieved_enable="YES"
+# dbmail_timsieved_flags="<set as needed>"
#
# See dbmail-timsieved(8) for flags
#
@@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf
# read settings, set default values
load_rc_config "$name"
: ${dbmail_timsieved_enable="NO"}
-: ${dbmail_timsieved_flags=""}
run_rc_command "$1"
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index b1e7d077b554..8e1dee427f4a 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -59,7 +59,6 @@ load_rc_config $name
: ${milterdkim_alg=""}
# Options other than above can be set with $milterdkim_flags.
# see dkim-milter documentation for detail.
-: ${milterdkim_flags=""}
if [ -n "$2" ]; then
profile="$2"
diff --git a/mail/drac/files/dracd.sh.in b/mail/drac/files/dracd.sh.in
index 341c90cf6aca..e7e1eeceb65e 100644
--- a/mail/drac/files/dracd.sh.in
+++ b/mail/drac/files/dracd.sh.in
@@ -22,7 +22,6 @@ command="%%PREFIX%%/sbin/rpc.dracd"
load_rc_config $name
: ${dracd_enable="NO"}
-: ${dracd_flags=""}
required_files="%%PREFIX%%/etc/dracd.allow"
diff --git a/mail/mailscanner-devel/files/mta.in b/mail/mailscanner-devel/files/mta.in
index fb3f433cbff7..7f24a03b9d01 100644
--- a/mail/mailscanner-devel/files/mta.in
+++ b/mail/mailscanner-devel/files/mta.in
@@ -69,7 +69,6 @@ load_rc_config $name
: ${mta_enable="NO"}
: ${mta_type="sendmail"}
-: ${mta_flags=""}
case "${mta_type}" in
diff --git a/mail/mailscanner/files/mta.in b/mail/mailscanner/files/mta.in
index fb3f433cbff7..7f24a03b9d01 100644
--- a/mail/mailscanner/files/mta.in
+++ b/mail/mailscanner/files/mta.in
@@ -69,7 +69,6 @@ load_rc_config $name
: ${mta_enable="NO"}
: ${mta_type="sendmail"}
-: ${mta_flags=""}
case "${mta_type}" in
diff --git a/mail/milter-regex/files/milterregex.sh.in b/mail/milter-regex/files/milterregex.sh.in
index 969e4cb6a0b1..74d0a72f25cf 100644
--- a/mail/milter-regex/files/milterregex.sh.in
+++ b/mail/milter-regex/files/milterregex.sh.in
@@ -8,13 +8,7 @@
# REQUIRE: DAEMON
# BEFORE: mail
# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0 through 6.0:
-# If you want this script to start with the base rc scripts
-# move milterregex to /etc/rc.d/milterregex
-# Not necessary for 6.1+
-prefix=%%PREFIX%%
spooldir=%%SPOOLDIR%%
# Define these milterregex_* variables in one of these files:
@@ -25,16 +19,15 @@ spooldir=%%SPOOLDIR%%
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
[ -z "$milterregex_enable" ] && milterregex_enable="NO" # Enable milter-regex
-#milterregex_program="${prefix}/libexec/milter-regex" # Location of milter-regex
-[ -z "$milterregex_flags" ] && milterregex_flags="" # Flags to milter-regex program
+# milterregex_flags="" # Flags to milter-regex program
. /etc/rc.subr
name="milterregex"
rcvar=`set_rcvar`
-command="${prefix}/libexec/milter-regex"
+command="%%PREFIX%%/libexec/milter-regex"
pidfile="${spooldir}/milter-regex.pid"
-required_files="${prefix}/etc/milter-regex.conf"
+required_files="%%PREFIX%%/etc/milter-regex.conf"
stop_postcmd="milterregex_poststop"
milterregex_poststop() {
diff --git a/mail/noattach/files/noattach.sh.in b/mail/noattach/files/noattach.sh.in
index 5bccc1f557b7..4e32b95f33aa 100644
--- a/mail/noattach/files/noattach.sh.in
+++ b/mail/noattach/files/noattach.sh.in
@@ -10,8 +10,6 @@
# KEYWORD: shutdown
#
-prefix=%%PREFIX%%
-
# Define these noattach_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
@@ -22,14 +20,14 @@ prefix=%%PREFIX%%
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=${noattach_flags:-""} # Flags to noattach
+# noattach_flags="" # Flags to noattach
. /etc/rc.subr
name="noattach"
rcvar=`set_rcvar`
-command="${prefix}/libexec/${name}"
-required_files="${prefix}/etc/noattach.patterns"
+command="%%PREFIX%%/libexec/${name}"
+required_files="%%PREFIX%%/etc/noattach.patterns"
start_precmd="noattach_prestart"
stop_postcmd="noattach_poststop"
reload_cmd="noattach_reload"
@@ -52,5 +50,3 @@ pidfile="${noattach_pidfile}"
command_args="-p local:${noattach_socket} ${noattach_flags}"
run_rc_command "$1"
-
-# eof
diff --git a/mail/perdition/files/perdition.imap4.in b/mail/perdition/files/perdition.imap4.in
index 2b02deb2a823..ecf021ef9f3b 100644
--- a/mail/perdition/files/perdition.imap4.in
+++ b/mail/perdition/files/perdition.imap4.in
@@ -9,12 +9,12 @@
# Add the following line to /etc/rc.conf to enable perdition.imap4
#
# perdition_imap4_enable="YES"
+# perdition_imap4_flags="<set as needed>"
#
# See perdition(8) for flags
#
perdition_imap4_enable=${perdition_imap4_enable-"NO"}
-perdition_imap4_flags=${perdition_imap4_flags-""}
. %%RC_SUBR%%
diff --git a/mail/perdition/files/perdition.imap4s.in b/mail/perdition/files/perdition.imap4s.in
index 6a03483202ff..dce3c92fd9e5 100644
--- a/mail/perdition/files/perdition.imap4s.in
+++ b/mail/perdition/files/perdition.imap4s.in
@@ -9,12 +9,12 @@
# Add the following line to /etc/rc.conf to enable perdition.imap4s
#
# perdition_imap4s_enable="YES"
+# perdition_imap4s_flags="<set as needed>"
#
# See perdition(8) for flags
#
perdition_imap4s_enable=${perdition_imap4s_enable-"NO"}
-perdition_imap4s_flags=${perdition_imap4s_flags-""}
. %%RC_SUBR%%
diff --git a/mail/perdition/files/perdition.imaps.in b/mail/perdition/files/perdition.imaps.in
index 79413b5d5308..9ff3d9bbabe6 100644
--- a/mail/perdition/files/perdition.imaps.in
+++ b/mail/perdition/files/perdition.imaps.in
@@ -9,12 +9,12 @@
# Add the following line to /etc/rc.conf to enable perdition.imaps
#
# perdition_imaps_enable="YES"
+# perdition_imaps_flags="<set as needed>"
#
# See perdition(8) for flags
#
perdition_imaps_enable=${perdition_imaps_enable-"NO"}
-perdition_imaps_flags=${perdition_imaps_flags-""}
. %%RC_SUBR%%
diff --git a/mail/perdition/files/perdition.in b/mail/perdition/files/perdition.in
index 86cc85822640..0243270943b1 100644
--- a/mail/perdition/files/perdition.in
+++ b/mail/perdition/files/perdition.in
@@ -6,15 +6,15 @@
# REQUIRE: DAEMON
# KEYWORD: shutdown
#
-# Add the following line to /etc/rc.conf to enable perdition
+# Add the following lines to /etc/rc.conf to enable perdition
#
# perdition_enable="YES"
+# perdition_flags="<set as needed>"
#
# See perdition(8) for flags
#
perdition_enable=${perdition_enable-"NO"}
-perdition_flags=${perdition_flags-""}
. %%RC_SUBR%%
diff --git a/mail/perdition/files/perdition.pop3.in b/mail/perdition/files/perdition.pop3.in
index c22af3346900..1f73c25fe5a1 100644
--- a/mail/perdition/files/perdition.pop3.in
+++ b/mail/perdition/files/perdition.pop3.in
@@ -6,15 +6,15 @@
# REQUIRE: DAEMON
# KEYWORD: shutdown
#
-# Add the following line to /etc/rc.conf to enable perdition.pop3
+# Add the following lines to /etc/rc.conf to enable perdition.pop3
#
# perdition_pop3_enable="YES"
+# perdition_pop3_flags="<set as needed>"
#
# See perdition(8) for flags
#
perdition_pop3_enable=${perdition_pop3_enable-"NO"}
-perdition_pop3_flags=${perdition_pop3_flags-""}
. %%RC_SUBR%%
diff --git a/mail/perdition/files/perdition.pop3s.in b/mail/perdition/files/perdition.pop3s.in
index 78e41a1802c4..26f3cbd1d5ff 100644
--- a/mail/perdition/files/perdition.pop3s.in
+++ b/mail/perdition/files/perdition.pop3s.in
@@ -6,15 +6,15 @@
# REQUIRE: DAEMON
# KEYWORD: shutdown
#
-# Add the following line to /etc/rc.conf to enable perdition.pop3s
+# Add the following lines to /etc/rc.conf to enable perdition.pop3s
#
# perdition_pop3s_enable="YES"
+# perdition_pop3s_flags="<set as needed>"
#
# See perdition(8) for flags
#
perdition_pop3s_enable=${perdition_pop3s_enable-"NO"}
-perdition_pop3s_flags=${perdition_pop3s_flags-""}
. %%RC_SUBR%%
diff --git a/mail/postfix-current/files/postfix.sh.in b/mail/postfix-current/files/postfix.sh.in
index 2b07d6c85c1d..c0065f1d4b9c 100644
--- a/mail/postfix-current/files/postfix.sh.in
+++ b/mail/postfix-current/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/postfix23/files/postfix.sh.in b/mail/postfix23/files/postfix.sh.in
index 2b07d6c85c1d..c0065f1d4b9c 100644
--- a/mail/postfix23/files/postfix.sh.in
+++ b/mail/postfix23/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/postfix24/files/postfix.sh.in b/mail/postfix24/files/postfix.sh.in
index 2b07d6c85c1d..c0065f1d4b9c 100644
--- a/mail/postfix24/files/postfix.sh.in
+++ b/mail/postfix24/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/py-apolicy/files/apolicyd.in b/mail/py-apolicy/files/apolicyd.in
index 07cf41bc9648..bcd1f480387a 100644
--- a/mail/py-apolicy/files/apolicyd.in
+++ b/mail/py-apolicy/files/apolicyd.in
@@ -6,22 +6,21 @@
# PROVIDE: apolicyd
# REQUIRE: TWISTD
# KEYWORD: shutdown
-#
-prefix=%%PREFIX%%
+
# Define these apolicyd_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
+
. %%RC_SUBR%%
name="apolicyd"
rcvar=`set_rcvar`
-command="%%LOCALBASE%%/bin/twistd"
+command="%%PREFIX%%/bin/twistd"
pidfile="/var/run/apolicyd.pid"
logfile="/var/log/apolicyd.log"
diff --git a/mail/py-ppolicy/files/ppolicyd.sh.in b/mail/py-ppolicy/files/ppolicyd.sh.in
index d234961fb03d..c1592221b35f 100644
--- a/mail/py-ppolicy/files/ppolicyd.sh.in
+++ b/mail/py-ppolicy/files/ppolicyd.sh.in
@@ -6,15 +6,12 @@
# PROVIDE: ppolicyd
# REQUIRE: TWISTD
# KEYWORD: shutdown
-#
-prefix=%%PREFIX%%
# Define these ppolicyd_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
. %%RC_SUBR%%
diff --git a/mail/rbl-milter/files/rblmilter.sh.in b/mail/rbl-milter/files/rblmilter.sh.in
index f09d159393b8..d5918b855cd4 100644
--- a/mail/rbl-milter/files/rblmilter.sh.in
+++ b/mail/rbl-milter/files/rblmilter.sh.in
@@ -10,8 +10,6 @@
# KEYWORD: shutdown
#
-prefix=%%PREFIX%%
-
# Define these rblmilter_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
@@ -27,7 +25,7 @@ rblmilter_flags=${rblmilter_flags:-"-l -r -d relays.ordb.org"} # Flags to rblmil
name="rblmilter"
rcvar=`set_rcvar`
-command="${prefix}/sbin/rbl-milter"
+command="%%PREFIX%%/sbin/rbl-milter"
start_precmd="rblmilter_prestart"
stop_postcmd="rblmilter_poststop"
extra_commands="reload"
diff --git a/mail/spamd/files/obspamd.in b/mail/spamd/files/obspamd.in
index eac1fb373e5a..21ab92820d4d 100644
--- a/mail/spamd/files/obspamd.in
+++ b/mail/spamd/files/obspamd.in
@@ -19,7 +19,6 @@
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
obspamd_enable=${obspamd_enable:-"NO"}
-obspamd_flags=${obspamd_flags:-""}
. %%RC_SUBR%%
diff --git a/mail/spamd/files/obspamlogd.in b/mail/spamd/files/obspamlogd.in
index 53fb60a3be99..89b4b2b8648c 100644
--- a/mail/spamd/files/obspamlogd.in
+++ b/mail/spamd/files/obspamlogd.in
@@ -19,7 +19,6 @@
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
obspamlogd_enable=${obspamlogd_enable:-"NO"}
-obspamlogd_flags=${obspamlogd_flags:-""}
. %%RC_SUBR%%
diff --git a/mail/spamilter/files/spamilter.sh.in b/mail/spamilter/files/spamilter.sh.in
index d1247ce5ea33..0a1cde8fd371 100644
--- a/mail/spamilter/files/spamilter.sh.in
+++ b/mail/spamilter/files/spamilter.sh.in
@@ -10,8 +10,6 @@
# KEYWORD: shutdown
#
-prefix=%%PREFIX%%
-
# Define these spamilter_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
@@ -20,15 +18,15 @@ prefix=%%PREFIX%%
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
spamilter_enable=${spamilter_enable:-"NO"} # Enable spamilter-milter
-spamilter_flags=${spamilter_flags:-""} # Flags to spamilter
+# spamilter_flags="" # Flags to spamilter
. /etc/rc.subr
name="spamilter"
rcvar=`set_rcvar`
-command="${prefix}/bin/spamilter"
+command="%%PREFIX%%/bin/spamilter"
pidfile="/tmp/Spamilter.pid"
-required_files="${prefix}/etc/spamilter.rc"
+required_files="%%PREFIX%%/etc/spamilter.rc"
start_precmd="spamilter_prestart"
stop_postcmd="spamilter_poststop"
@@ -42,8 +40,4 @@ spamilter_poststop() {
load_rc_config $name
-command_args="${spamilter_flags}"
-
run_rc_command "$1"
-
-# eof
diff --git a/mail/spampd/files/spampd.in b/mail/spampd/files/spampd.in
index a56add6ec45f..974d78a6c44b 100644
--- a/mail/spampd/files/spampd.in
+++ b/mail/spampd/files/spampd.in
@@ -23,7 +23,7 @@ rcvar=`set_rcvar`
load_rc_config $name
command="%%PREFIX%%/sbin/$name"
-command_args="${spampd_flags} --pid=${spampd_pidfile}"
+command_args="--pid=${spampd_pidfile}"
pidfile="${spampd_pidfile}"
sig_stop="-KILL"
stop_cmd="stop_cmd"
diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.sh.in
index 72c1685f342e..5183e486cf56 100644
--- a/mail/vbsfilter/files/vbsfilter.sh.in
+++ b/mail/vbsfilter/files/vbsfilter.sh.in
@@ -10,8 +10,6 @@
# KEYWORD: shutdown
#
-prefix=%%PREFIX%%
-
# Define these vbsfilter_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
@@ -21,13 +19,13 @@ prefix=%%PREFIX%%
#
vbsfilter_enable=${vbsfilter_enable:-"NO"} # Enable vbsfilter-milter
vbsfilter_socket=${vbsfilter_socket:-"/var/run/vbsfilter"} # Path to socket
-vbsfilter_flags=${vbsfilter_flags:-""} # Flags to vbsfilter
+# vbsfilter_flags="" # Flags to vbsfilter
. /etc/rc.subr
name="vbsfilter"
rcvar=`set_rcvar`
-command="${prefix}/libexec/vbsfilter"
+command="%%PREFIX%%/libexec/vbsfilter"
procname="${command}"
start_precmd="vbsfilter_prestart"
stop_postcmd="vbsfilter_poststop"
@@ -42,7 +40,7 @@ vbsfilter_poststop() {
load_rc_config $name
-command_args="-p local:${vbsfilter_socket} ${vbsfilter_flags}"
+command_args="-p local:${vbsfilter_socket}"
run_rc_command "$1"