Clean up the scripts to use the new variables:

xntpd_* -> ntpd_*
portmap_* -> rpcbind_*

Also change single_mountd_enable -> mountd_enable
Changing the mountd flags brings us closer to NetBSD.

All of the old variable names are shimmed so you can continue to use the
old variable name.

Finally make /etc/rc.d/mountd no longer dependent on nfs as there are
(apparently) other consumers of mountd.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>

1 files changed, 3 insertions, 14 deletions

diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index 191d6de..a11da1f 100755
--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@@ -11,25 +11,14 @@
 . /etc/rc.subr
 
 name="rpcbind"
-
-# XXX - Executable may be in a different location. The $name variable
-#	is different from the variable in rc.conf(5) so the
-#	subroutines in rc.subr won't catch it.
-#
-load_rc_config $name
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
 
 case `${CMD_OSTYPE}` in
-FreeBSD)
-	pidfile=
-	rcvar="portmap_enable"
-	command="${portmap_program:-/usr/sbin/${name}}"
-	eval ${name}_flags=\"${portmap_flags}\"
-	;;
 NetBSD)
-	rcvar=$name
-	command="/usr/sbin/${name}"
 	pidfile="/var/run/${name}.pid"
 	;;
 esac
 
+load_rc_config $name
 run_rc_command "$1"