- Make rc variables can be properly set by users. Default variables should be

  handled after load_rc_config per Handbook. For example, if user sets
  name_pidfile in rc.conf, it does not correctly pass to name_flags because
  when we set name_flags, it uses our default name_pidfile, but not user's.
- Bump PORTREVISION as rc scripts changed.

Approved by:	portmgr (pav), Xavier Beaudouin <kiwi at oav.net> (ovs maintainer)

4 files changed, 6 insertions, 4 deletions

diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 5fe0ede8989b..5b4e8f0f33b1 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mailgraph
 PORTVERSION=	1.14
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://mailgraph.schweikert.ch/pub/ \
 		http://mailgraph.schweikert.ch/pub/old/
diff --git a/mail/mailgraph/files/mailgraph.in b/mail/mailgraph/files/mailgraph.in
index b09d47d8f656..322a896adf26 100644
--- a/mail/mailgraph/files/mailgraph.in
+++ b/mail/mailgraph/files/mailgraph.in
@@ -24,14 +24,14 @@ stop_postcmd()
     rm -f $pidfile
 }
 
+load_rc_config $name
+
 : ${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
-
 pidfile=${mailgraph_pidfile}
 
 run_rc_command "$1"
diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index aaa17333f1c4..e0f6175cab8b 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ovs
 PORTVERSION=	1.02
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.oav.net/openvisp/stats/
 
diff --git a/mail/ovs/files/ovs.sh.in b/mail/ovs/files/ovs.sh.in
index 7bc4eb78f3fe..8702b9caea1f 100644
--- a/mail/ovs/files/ovs.sh.in
+++ b/mail/ovs/files/ovs.sh.in
@@ -24,14 +24,14 @@ stop_postcmd()
     rm -f $pidfile
 }
 
+load_rc_config $name
+
 : ${ovs_enable="NO"}
 : ${ovs_pidfile="%%DATADIR%%/ovs.pid"}
 : ${ovs_flags="--logfile /var/log/maillog --daemon-rrd=%%DATADIR%% --ignore-localhost --daemon --daemon-pid=${ovs_pidfile} --rbl-is-spam --greylist --helo --spf --domain-not-found"}
 : ${ovs_user="%%OVS_USER%%"}
 : ${ovs_chdir="%%DATADIR%%"}
 
-load_rc_config $name
-
 pidfile=${ovs_pidfile}
 
 run_rc_command "$1"