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, 6 insertions, 9 deletions

diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index 81671a1..fa1726e 100755
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -11,21 +11,18 @@
 
 . /etc/rc.subr
 
+name=ntpd
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="/etc/ntp.conf"
+
 case `${CMD_OSTYPE}` in
-FreeBSD)
-	name="xntpd"
-	;;
 NetBSD)
-	name="ntpd"
 	start_precmd="ntpd_precmd"
 	;;
 esac
 
-rcvar=`set_rcvar`
-command="/usr/sbin/ntpd"
-pidfile="/var/run/ntpd.pid"
-required_files="/etc/ntp.conf"
-
 ntpd_precmd()
 {
 	if [ -z "$ntpd_chrootdir" ]; then