- Remove MAILGRAPH_GROUP from pre-everything message and mailgraph_group

  from rc script to avoid user confusion. We can not setgid for command
  invoked from rc.subr. [1]
- Change rc script to match our guideline in Porter's Handbook

Noticed by:	Nicolas Rachinsky <nicolas-2007 at rachinsky.de> [1]

1 files changed, 7 insertions, 8 deletions

diff --git a/mail/mailgraph/files/mailgraph.in b/mail/mailgraph/files/mailgraph.in
index ffb1005e989f..b09d47d8f656 100644
--- a/mail/mailgraph/files/mailgraph.in
+++ b/mail/mailgraph/files/mailgraph.in
@@ -12,10 +12,10 @@
 
 . %%RC_SUBR%%
 
-name=mailgraph
+name="mailgraph"
 rcvar=`set_rcvar`
 
-command=%%PREFIX%%/sbin/mailgraph.pl > /dev/null 2>&1
+command=%%PREFIX%%/sbin/${name}.pl > /dev/null 2>&1
 command_interpreter=/usr/bin/perl
 stop_postcmd=stop_postcmd
 
@@ -24,12 +24,11 @@ stop_postcmd()
     rm -f $pidfile
 }
 
-mailgraph_enable=${mailgraph_enable:-"NO"}
-mailgraph_pidfile=${mailgraph_pidfile:-"%%DATADIR%%/mailgraph.pid"}
-mailgraph_flags=${mailgraph_flags:-"--logfile /var/log/maillog --daemon-rrd=%%DATADIR%% --ignore-localhost --daemon --daemon-pid=${mailgraph_pidfile}"}
-mailgraph_user=${mailgraph_user:-"%%MAILGRAPH_USER%%"}
-mailgraph_group=${mailgraph_group:-"%%MAILGRAPH_GROUP%%"}
-mailgraph_chdir=${mailgraph_chdir:-"%%DATADIR%%"}
+: ${mailgraph_enable="NO"}
+: ${mailgraph_pidfile="%%DATADIR%%/mailgraph.pid"}
+: ${mailgraph_flags="--logfile /var/log/maillog --daemon-rrd=%%DATADIR%% --ignore-localhost --daemon --daemon-pid=${mailgraph_pidfile}"}
+: ${mailgraph_user="%%MAILGRAPH_USER%%"}
+: ${mailgraph_chdir="%%DATADIR%%"}
 
 load_rc_config $name