3 files changed, 17 insertions, 13 deletions
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 7860bd8a8d55..c30342f09b1e 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	milter-greylist
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
 EXTRACT_SUFX=	.tgz
diff --git a/mail/milter-greylist/files/milter-greylist.in b/mail/milter-greylist/files/milter-greylist.in
index ef708559081f..15524546d05d 100644
--- a/mail/milter-greylist/files/milter-greylist.in
+++ b/mail/milter-greylist/files/milter-greylist.in
@@ -13,6 +13,14 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
+
+. %%RC_SUBR%%
+
+name="miltergreylist"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
 miltergreylist_enable=${miltergreylist_enable-"NO"}
 miltergreylist_runas=${miltergreylist_runas-"smmsp"}
 miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
@@ -21,12 +29,6 @@ miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.co
 miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
 -f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
 
-. %%RC_SUBR%%
-
-name="miltergreylist"
-rcvar=`set_rcvar`
 command="%%PREFIX%%/bin/milter-greylist"
 
-load_rc_config $name
-
 run_rc_command "$1"
diff --git a/mail/milter-greylist/files/milter-greylist.sh b/mail/milter-greylist/files/milter-greylist.sh
index ef708559081f..15524546d05d 100644
--- a/mail/milter-greylist/files/milter-greylist.sh
+++ b/mail/milter-greylist/files/milter-greylist.sh
@@ -13,6 +13,14 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
+
+. %%RC_SUBR%%
+
+name="miltergreylist"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
 miltergreylist_enable=${miltergreylist_enable-"NO"}
 miltergreylist_runas=${miltergreylist_runas-"smmsp"}
 miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
@@ -21,12 +29,6 @@ miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.co
 miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
 -f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
 
-. %%RC_SUBR%%
-
-name="miltergreylist"
-rcvar=`set_rcvar`
 command="%%PREFIX%%/bin/milter-greylist"
 
-load_rc_config $name
-
 run_rc_command "$1"