Merge in all the changes that Mike Makonnen has been maintaining for a

while. This is only the script pieces, the glue for the build comes next.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>
Reviewed by:	silence on -current and -hackers
Prodded by:	rwatson

1 files changed, 24 insertions, 5 deletions

diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index 1715975..9f6e544 100755
--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@@ -1,17 +1,36 @@
 #!/bin/sh
 #
-# $NetBSD: rpcbind,v 1.4 2000/07/26 00:11:49 lukem Exp $
+# $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: rpcbind
-# REQUIRE: NETWORK ntpdate syslogd named ppp
+# REQUIRE: NETWORKING ntpdate syslogd named ppp
+# KEYWORD: FreeBSD NetBSD
 
 . /etc/rc.subr
 
 name="rpcbind"
-rcvar=$name
-command="/usr/sbin/${name}"
-pidfile="/var/run/${name}.pid"
 
+# 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
+command="${portmap_program:-/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
+
 run_rc_command "$1"