- Fix rc.subr scripts

Pointed out by:	Vlastimil Zeman <vlastimil.zeman@col.cz>

3 files changed, 14 insertions, 14 deletions

diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index eb4f87d8a46c..3b3109ebb75e 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	popular
 PORTVERSION=	1.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.remote.org/jochen/mail/popular/download/
 
diff --git a/mail/popular/files/pcheckd.sh.in b/mail/popular/files/pcheckd.sh.in
index 382d613960d9..f1b4654091c0 100644
--- a/mail/popular/files/pcheckd.sh.in
+++ b/mail/popular/files/pcheckd.sh.in
@@ -9,8 +9,8 @@
 # KEYWORD: shutdown
 
 # /etc/rc.conf lines:
-# pcheckd="YES"   # enable pcheckd
-# pcheckd="pop"   # user for pcheckd
+# pcheckd_enable="YES"   # enable pcheckd
+# pcheckd_user="pop"   # user for pcheckd
 
 . %%RC_SUBR%%
 
@@ -19,8 +19,8 @@ rcvar=`set_rcvar`
 
 load_rc_config $name
 
-: ${pcheckd="NO"}
-: ${pcheckd="pop"}
+: ${pcheckd_enable="NO"}
+: ${pcheckd_user="pop"}
 
 command="%%PREFIX%%/sbin/pcheckd"
 start_precmd="${name}_prestart"
@@ -29,9 +29,9 @@ extra_commands="reload"
 pproxy_prestart()
 {
 	mkdir -p /var/log/popular
-	chown ${pproxy_user} /var/log/popular
+	chown ${pcheckd_user} /var/log/popular
 	mkdir -p /var/run/popular
-	chown ${pproxy_user} /var/run/popular
+	chown ${pcheckd_user} /var/run/popular
 }
 
 run_rc_command "$1"
diff --git a/mail/popular/files/pserv.sh.in b/mail/popular/files/pserv.sh.in
index 1084711d577a..d86008220163 100644
--- a/mail/popular/files/pserv.sh.in
+++ b/mail/popular/files/pserv.sh.in
@@ -9,8 +9,8 @@
 # KEYWORD: shutdown
 
 # /etc/rc.conf lines:
-# pserv="YES"   # enable pserv
-# pserv="pop"   # user for pserv
+# pserv_enable="YES"   # enable pserv
+# pserv_user="pop"   # user for pserv
 
 . %%RC_SUBR%%
 
@@ -19,8 +19,8 @@ rcvar=`set_rcvar`
 
 load_rc_config $name
 
-: ${pserv="NO"}
-: ${pserv="pop"}
+: ${pserv_enable="NO"}
+: ${pserv_user="pop"}
 
 command="%%PREFIX%%/sbin/pserv"
 start_precmd="${name}_prestart"
@@ -31,16 +31,16 @@ reload_cmd="${name}_configure"
 pproxy_prestart()
 {
 	mkdir -p /var/log/popular
-	chown ${pproxy_user} /var/log/popular
+	chown ${pserv_user} /var/log/popular
 	mkdir -p /var/run/popular
-	chown ${pproxy_user} /var/run/popular
+	chown ${pserv_user} /var/run/popular
 }
 
 pproxy_configure()
 {
 	if [ -f %%PREFIX%%/etc/popular/pserv.rc ]; then
 		sleep 1;
-		su -m ${pproxy_user} -c "%%PREFIX%%/bin/pcontrol --program=pserv %%PREFIX%%/etc/popular/pserv.rc"
+		su -m ${pserv_user} -c "%%PREFIX%%/bin/pcontrol --program=pserv %%PREFIX%%/etc/popular/pserv.rc"
 	fi
 }