From 2c60452396cf06867bda73868092df0948f98f72 Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Mon, 26 Jan 2004 17:21:15 +0000
Subject: [PATCH] remove NetBSD and FreeBSD from rcng scripts

---
 etc/rc.d/DAEMON       |   4 +-
 etc/rc.d/LOGIN        |   4 +-
 etc/rc.d/NETWORKING   |   4 +-
 etc/rc.d/SERVERS      |   4 +-
 etc/rc.d/abi          |   4 +-
 etc/rc.d/accounting   |  45 ++++-----------
 etc/rc.d/addswap      |   4 +-
 etc/rc.d/adjkerntz    |   4 +-
 etc/rc.d/amd          |  52 +-----------------
 etc/rc.d/apm          |   4 +-
 etc/rc.d/archdep      |   4 +-
 etc/rc.d/atm1         |   4 +-
 etc/rc.d/atm2.sh      |   4 +-
 etc/rc.d/atm3.sh      |   4 +-
 etc/rc.d/bootparams   |  18 +-----
 etc/rc.d/ccd          |   4 +-
 etc/rc.d/cleanvar     |   4 +-
 etc/rc.d/cleartmp     |  21 +------
 etc/rc.d/cron         |   4 +-
 etc/rc.d/dhclient     |  20 +------
 etc/rc.d/diskless     |   4 +-
 etc/rc.d/dmesg        |   4 +-
 etc/rc.d/dumpon       |   4 +-
 etc/rc.d/early.sh     |   4 +-
 etc/rc.d/fsck         |  40 +-------------
 etc/rc.d/hostname     |   4 +-
 etc/rc.d/inetd        |   4 +-
 etc/rc.d/initdiskless |   4 +-
 etc/rc.d/initrandom   |   4 +-
 etc/rc.d/ip6fw        |   4 +-
 etc/rc.d/ipfilter     | 125 +-----------------------------------------
 etc/rc.d/ipfs         |  14 +----
 etc/rc.d/ipfw         |   4 +-
 etc/rc.d/ipmon        |  13 +----
 etc/rc.d/ipnat        |  20 +------
 etc/rc.d/ipsec        |  22 ++------
 etc/rc.d/ipxrouted    |   4 +-
 etc/rc.d/isdnd        |  18 +-----
 etc/rc.d/jail         |   4 +-
 etc/rc.d/kadmind      |   4 +-
 etc/rc.d/kerberos     |   4 +-
 etc/rc.d/keyserv      |   4 +-
 etc/rc.d/kldxref      |   4 +-
 etc/rc.d/kpasswdd     |   4 +-
 etc/rc.d/ldconfig     |  48 +---------------
 45 files changed, 102 insertions(+), 482 deletions(-)

diff --git a/etc/rc.d/DAEMON b/etc/rc.d/DAEMON
index 7269e88310..9ecfa6d6de 100644
--- a/etc/rc.d/DAEMON
+++ b/etc/rc.d/DAEMON
@@ -2,12 +2,12 @@
 #
 # $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/DAEMON,v 1.3 2002/10/12 13:49:20 schweikh Exp $
-# $DragonFly: src/etc/rc.d/DAEMON,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/DAEMON,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: DAEMON
 # REQUIRE: NETWORKING SERVERS
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 #	This is a dummy dependency, to ensure that general purpose daemons
 #	are run _after_ the above are.
diff --git a/etc/rc.d/LOGIN b/etc/rc.d/LOGIN
index e3b9637932..2b4c5d5932 100644
--- a/etc/rc.d/LOGIN
+++ b/etc/rc.d/LOGIN
@@ -2,12 +2,12 @@
 #
 # $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/LOGIN,v 1.3 2002/10/12 13:49:20 schweikh Exp $
-# $DragonFly: src/etc/rc.d/LOGIN,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/LOGIN,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: LOGIN
 # REQUIRE: DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 #	This is a dummy dependency to ensure user services such as xdm,
 #	inetd, cron and kerberos are started after everything else, in case
diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
index e075dc2071..95c0776cd8 100644
--- a/etc/rc.d/NETWORKING
+++ b/etc/rc.d/NETWORKING
@@ -2,13 +2,13 @@
 #
 # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/NETWORKING,v 1.6 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/NETWORKING,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/NETWORKING,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: network dhclient altqd netif routing network_ipv6 isdnd ppp-user
 # REQUIRE: routed mrouted route6d mroute6d
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 #	This is a dummy dependency, for services which require networking
 #	to be operational before starting.
diff --git a/etc/rc.d/SERVERS b/etc/rc.d/SERVERS
index 8462b98756..64ea71df1a 100644
--- a/etc/rc.d/SERVERS
+++ b/etc/rc.d/SERVERS
@@ -2,12 +2,12 @@
 #
 # $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/SERVERS,v 1.3 2002/10/12 13:49:21 schweikh Exp $
-# $DragonFly: src/etc/rc.d/SERVERS,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/SERVERS,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: SERVERS
 # REQUIRE: mountcritremote
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 #	This is a dummy dependency, for early-start servers relying on
 #	some basic configuration.
diff --git a/etc/rc.d/abi b/etc/rc.d/abi
index ab79e63260..62e3f82569 100644
--- a/etc/rc.d/abi
+++ b/etc/rc.d/abi
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $
-# $DragonFly: src/etc/rc.d/abi,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/abi,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: abi
 # REQUIRE: LOGIN
 # BEFORE:  securelevel
-# KEYWORD: DragonFly FreeBSD 
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/accounting b/etc/rc.d/accounting
index e3de563b91..ae17ffb15a 100644
--- a/etc/rc.d/accounting
+++ b/etc/rc.d/accounting
@@ -2,13 +2,13 @@
 #
 # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/accounting,v 1.4 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/accounting,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/accounting,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: accounting
 # REQUIRE: mountall
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD 
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
@@ -21,40 +21,15 @@ stop_cmd="accounting_stop"
 
 accounting_start()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		_dir=`dirname "$accounting_file"`
-		if [ ! -d `dirname "$_dir"` ]; then
-			if ! mkdir -p "$_dir"; then
-				warn "Could not create $_dir."
-				return 1
-			fi
+	_dir=`dirname "$accounting_file"`
+	if [ ! -d `dirname "$_dir"` ]; then
+		if ! mkdir -p "$_dir"; then
+			warn "Could not create $_dir."
+			return 1
 		fi
-		if [ ! -e "$accounting_file" ]; then
-			touch "$accounting_file"
-		fi
-		;;
-	FreeBSD) 
-		_dir=`dirname "$accounting_file"`
-		if [ ! -d `dirname "$_dir"` ]; then
-			if ! mkdir -p "$_dir"; then
-				warn "Could not create $_dir."
-				return 1
-			fi
-		fi
-		if [ ! -e "$accounting_file" ]; then
-			touch "$accounting_file"
-		fi
-		;;
-	
-
-	*)
-		;;
-	esac
-
-	if [ ! -f ${accounting_file} ]; then
-		echo "Creating accounting file ${accounting_file}"
-		( umask 022 ; > ${accounting_file} )
+	fi
+	if [ ! -e "$accounting_file" ]; then
+		touch "$accounting_file"
 	fi
 	echo "Turning on accounting."
 	${accounting_command} ${accounting_file}
diff --git a/etc/rc.d/addswap b/etc/rc.d/addswap
index d9f4b21861..2e1e25c182 100644
--- a/etc/rc.d/addswap
+++ b/etc/rc.d/addswap
@@ -3,13 +3,13 @@
 # Add additional swap files
 #
 # $FreeBSD: src/etc/rc.d/addswap,v 1.2 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/addswap,v 1.2 2003/10/18 14:17:30 hmp Exp $
+# $DragonFly: src/etc/rc.d/addswap,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: addswap
 # REQUIRE: mountcritlocal
 # BEFORE: sysctl
-# KEYWORD: DragonFly FreeBSD 
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/adjkerntz b/etc/rc.d/adjkerntz
index 3ce9534dfe..65d92db3fe 100644
--- a/etc/rc.d/adjkerntz
+++ b/etc/rc.d/adjkerntz
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/adjkerntz,v 1.2 2003/04/18 17:55:05 mtm Exp $
-# $DragonFly: src/etc/rc.d/adjkerntz,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/adjkerntz,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: adjkerntz
 # REQUIRE: diskless mountcritlocal random
 # BEFORE: netif
-# KEYWORD: DragonFly FreeBSD 
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index 074de2ea02..d3b00e1eae 100644
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@@ -2,13 +2,13 @@
 #
 # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
 # $FreeBSD: src/etc/rc.d/amd,v 1.9 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/amd,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/amd,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: amd
 # REQUIRE: rpcbind mountall ypbind nfsclient
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD 
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
@@ -16,27 +16,11 @@ name="amd"
 rcvar=`set_rcvar`
 command="/usr/sbin/${name}"
 
-case ${OSTYPE} in
-DragonFly)
 	start_precmd="amd_precmd"
 	command_args="&"
-	;;
-FreeBSD)
-	start_precmd="amd_precmd"
-	command_args="&"
-	;;
-NetBSD)
-	command_args='-p -a '$amd_dir' -F /etc/amd.conf >/var/run/amd.pid'
-	required_dirs="$amd_dir"
-	required_files="/etc/amd.conf"
-	required_vars="rpcbind"
-	;;
-esac
 
 amd_precmd()
 {
-	case ${OSTYPE} in
-	DragonFly)
 		if ! checkyesno nfs_client_enable; then
 			force_depend nfsclient || return 1
 		fi
@@ -63,38 +47,6 @@ amd_precmd()
 			fi
 			;;
 		esac
-	;;
-
-	FreeBSD)
-		if ! checkyesno nfs_client_enable; then
-			force_depend nfsclient || return 1
-		fi
-
-		if ! checkyesno rpcbind_enable  && \
-		    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
-		then
-			force_depend rpcbind || return 1
-		fi
-
-		case ${amd_map_program} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			rc_flags="${rc_flags} `eval ${amd_map_program}`"
-			;;
-		esac
-
-		case "${amd_flags}" in
-		'')
-			if [ ! -r /etc/amd.conf ]; then
-				warn 'amd will not load without arguments'
-				return 1
-			fi
-			;;
-		esac
-		;;
-	esac
-	return 0
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/apm b/etc/rc.d/apm
index 83eaea2062..0857d81c34 100644
--- a/etc/rc.d/apm
+++ b/etc/rc.d/apm
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/apm,v 1.4 2003/06/09 17:44:30 mtm Exp $
-# $DragonFly: src/etc/rc.d/apm,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/apm,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: apm
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly  FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep
index 06afb7f3b0..fa969c65d6 100644
--- a/etc/rc.d/archdep
+++ b/etc/rc.d/archdep
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $
-# $DragonFly: src/etc/rc.d/Attic/archdep,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/archdep,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: archdep
 # REQUIRE: LOGIN
 # BEFORE: abi
-# KEYWORD: DragonFly FreeBSD 
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1
index ed4bcb76e0..88d80ed50d 100644
--- a/etc/rc.d/atm1
+++ b/etc/rc.d/atm1
@@ -25,13 +25,13 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/atm1,v 1.12 2003/04/18 17:55:05 mtm Exp $
-# $DragonFly: src/etc/rc.d/atm1,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/atm1,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: atm1
 # REQUIRE: root
 # BEFORE: netif
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/atm2.sh b/etc/rc.d/atm2.sh
index 29b6a33b0c..609125d451 100644
--- a/etc/rc.d/atm2.sh
+++ b/etc/rc.d/atm2.sh
@@ -25,13 +25,13 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/atm2.sh,v 1.13 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/atm2.sh,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/atm2.sh,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: atm2
 # REQUIRE: atm1 netif
 # BEFORE:  routing
-# KEYWORD: DragonFly FreeBSD 
+# KEYWORD: DragonFly 
 
 #
 # Additional ATM interface configuration
diff --git a/etc/rc.d/atm3.sh b/etc/rc.d/atm3.sh
index 708e4e4725..7de4575e40 100644
--- a/etc/rc.d/atm3.sh
+++ b/etc/rc.d/atm3.sh
@@ -25,7 +25,7 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/atm3.sh,v 1.10 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/atm3.sh,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/atm3.sh,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # Start ATM daemons
@@ -36,7 +36,7 @@
 # PROVIDE: atm3
 # REQUIRE: atm2
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD 
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 dummy_rc_command "$1"
diff --git a/etc/rc.d/bootparams b/etc/rc.d/bootparams
index 0c8f9f65dd..a0d654c76a 100644
--- a/etc/rc.d/bootparams
+++ b/etc/rc.d/bootparams
@@ -2,31 +2,19 @@
 #
 # $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/bootparams,v 1.4 2002/09/06 16:18:05 gordon Exp $
-# $DragonFly: src/etc/rc.d/bootparams,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/bootparams,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: bootparams
 # REQUIRE: rpcbind DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
 name="bootparamd"
 rcvar=`set_rcvar`
 required_files="/etc/bootparams"
-
-case ${OSTYPE} in
-DragonFly)
-	command="/usr/sbin/${name}"
-	;;
-FreeBSD)
-	command="/usr/sbin/${name}"
-	;;
-NetBSD)
-	command="/usr/sbin/rpc.${name}"
-	;;
-esac
-
+command="/usr/sbin/${name}"
 load_rc_config $name
 run_rc_command "$1"
diff --git a/etc/rc.d/ccd b/etc/rc.d/ccd
index 2b2b0a6e3c..7f8113ad06 100644
--- a/etc/rc.d/ccd
+++ b/etc/rc.d/ccd
@@ -2,11 +2,11 @@
 #
 # $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $
 # $FreeBSD: src/etc/rc.d/ccd,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/ccd,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/ccd,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: disks
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar
index 5e281507ee..1656605691 100644
--- a/etc/rc.d/cleanvar
+++ b/etc/rc.d/cleanvar
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/cleanvar,v 1.5 2003/07/14 13:02:36 mtm Exp $
-# $DragonFly: src/etc/rc.d/cleanvar,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/cleanvar,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: cleanvar
 # REQUIRE: mountcritlocal
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr 
 
diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp
index 6477ac0511..bae5bd0156 100644
--- a/etc/rc.d/cleartmp
+++ b/etc/rc.d/cleartmp
@@ -2,13 +2,13 @@
 #
 # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/cleartmp,v 1.4 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/cleartmp,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/cleartmp,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: cleartmp
 # REQUIRE: mountall
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -28,28 +28,13 @@ cleartmp_start()
 	(cd /tmp && rm -rf [a-km-pr-zA-Z]* &&
 	    find -x . ! -name . ! -name lost+found ! -name quota.user \
 		! -name quota.group -exec rm -rf -- {} \; -type d -prune)
-
-	case ${OSTYPE} in
-	DragonFly)
-		# Remove X lock files, since they will prevent you from
-		# restarting X
-		#
-		rm -f /tmp/.X*-lock
-		rm -fr /tmp/.X11-unix
-		mkdir -m 1777 /tmp/.X11-unix
-		;;
-
-	FreeBSD)
+	
 		# Remove X lock files, since they will prevent you from
 		# restarting X
 		#
 		rm -f /tmp/.X*-lock
 		rm -fr /tmp/.X11-unix
 		mkdir -m 1777 /tmp/.X11-unix
-		;;
-	NetBSD)
-		;;
-	esac
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/cron b/etc/rc.d/cron
index 61eed3ddc6..4af088849c 100644
--- a/etc/rc.d/cron
+++ b/etc/rc.d/cron
@@ -2,13 +2,13 @@
 #
 # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $
 # $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $
-# $DragonFly: src/etc/rc.d/cron,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/cron,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: cron
 # REQUIRE: LOGIN
 # BEFORE: securelevel
-# KEYWORD: DragonFly FreeBSD NetBSD shutdown
+# KEYWORD: DragonFly  shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient
index dfbed4f566..f0aa708ce1 100644
--- a/etc/rc.d/dhclient
+++ b/etc/rc.d/dhclient
@@ -2,13 +2,13 @@
 #
 # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/dhclient,v 1.6 2003/06/29 05:34:41 mtm Exp $
-# $DragonFly: src/etc/rc.d/dhclient,v 1.4 2003/12/13 03:02:20 dillon Exp $
+# $DragonFly: src/etc/rc.d/dhclient,v 1.5 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: dhclient
 # REQUIRE: network netif mountcritlocal
 # BEFORE:  NETWORKING
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 #
 #	Note that there no syslog logging of dhclient messages at boot because
 #	dhclient needs to start before services that syslog depends upon do.
@@ -19,29 +19,13 @@
 
 name="dhclient"
 pidfile="/var/run/${name}.pid"
-case "${OSTYPE}" in
-DragonFly)
 	rcvar=
 	start_precmd="dhclient_prestart"
 	start_postcmd="dhclient_poststart"
 	stop_cmd="dhclient_stop"
 	stop_precmd="dhclient_prestop"
 	stop_postcmd="dhclient_poststop"
-	;;
 
-FreeBSD)
-	rcvar=
-	start_precmd="dhclient_prestart"
-	start_postcmd="dhclient_poststart"
-	stop_cmd="dhclient_stop"
-	stop_precmd="dhclient_prestop"
-	stop_postcmd="dhclient_poststop"
-	;;
-NetBSD)
-	rcvar=$name
-	command="/sbin/${name}"
-	;;
-esac
 
 dhclient_common()
 {
diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless
index 887c3f56dd..35b52f3808 100644
--- a/etc/rc.d/diskless
+++ b/etc/rc.d/diskless
@@ -25,13 +25,13 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/diskless,v 1.25 2003/02/15 16:34:14 jhay Exp $
-# $DragonFly: src/etc/rc.d/diskless,v 1.3 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/diskless,v 1.4 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: diskless
 # REQUIRE: initdiskless rcconf mountcritlocal
 # BEFORE: addswap random
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 if [ -r /etc/rc.subr ]; then
     . /etc/rc.subr
diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg
index 78f485301b..fbaacfdb67 100644
--- a/etc/rc.d/dmesg
+++ b/etc/rc.d/dmesg
@@ -2,13 +2,13 @@
 #
 # $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/dmesg,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/dmesg,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/dmesg,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: dmesg
 # REQUIRE: mountcritremote
 # BEFORE:  DAEMON
-# KEYWORD: DragonFly FreeBSD Daemon
+# KEYWORD: DragonFly  Daemon
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index 7c65a36a14..886ae59c5b 100644
--- a/etc/rc.d/dumpon
+++ b/etc/rc.d/dumpon
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/dumpon,v 1.1 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/dumpon,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/dumpon,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: dumpon
 # REQUIRE: initrandom
 # BEFORE: disks savecore
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/early.sh b/etc/rc.d/early.sh
index cd464ace65..fe70f6b2b1 100644
--- a/etc/rc.d/early.sh
+++ b/etc/rc.d/early.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/early.sh,v 1.1 2003/04/24 08:27:29 mtm Exp $
-# $DragonFly: src/etc/rc.d/Attic/early.sh,v 1.2 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/early.sh,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: early
 # REQUIRE: disks localswap
 # BEFORE:  fsck
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 #
 # Support for legacy /etc/rc.early script
diff --git a/etc/rc.d/fsck b/etc/rc.d/fsck
index 86f93e861c..c63143ef4a 100644
--- a/etc/rc.d/fsck
+++ b/etc/rc.d/fsck
@@ -2,12 +2,12 @@
 #
 # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $
 # $FreeBSD: src/etc/rc.d/fsck,v 1.4 2002/10/12 10:31:31 schweikh Exp $
-# $DragonFly: src/etc/rc.d/fsck,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/fsck,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: fsck
 # REQUIRE: localswap
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -35,17 +35,7 @@ fsck_start()
 		trap : 3
 
 		echo "Starting file system checks:"
-		case ${OSTYPE} in
-		DragonFly)
 			fsck -p
-			;;
-		FreeBSD)
-			fsck -p
-			;;
-		NetBSD)
-			fsck -p
-			;;
-		esac
 
 		case $? in
 		0)
@@ -60,8 +50,6 @@ fsck_start()
 			stop_boot
 			;;
 		8)
-		case ${OSTYPE} in
-		DragonFly)
 			if checkyesno fsck_y_enable; then
 				echo "File system preen failed, trying fsck -y."
 				fsck -y
@@ -77,31 +65,7 @@ fsck_start()
 				echo "Automatic file system check failed; help!"
 				stop_boot
 			fi
-		;;
-
-		FreeBSD)
-			if checkyesno fsck_y_enable; then
-				echo "File system preen failed, trying fsck -y."
-				fsck -y
-				case $? in
-				0)
-					;;
-				*)
-				echo "Automatic file system check failed; help!"
-					stop_boot
-					;;
-				esac
-			else
-				echo "Automatic file system check failed; help!"
-				stop_boot
-			fi
 			;;
-		NetBSD)
-			echo "Automatic file system check failed; help!"
-			stop_boot
-			;;
-		esac
-		;;
 		12)
 			echo "Boot interrupted."
 			stop_boot
diff --git a/etc/rc.d/hostname b/etc/rc.d/hostname
index ae7b10fd30..1be19d493d 100644
--- a/etc/rc.d/hostname
+++ b/etc/rc.d/hostname
@@ -24,13 +24,13 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/hostname,v 1.2 2003/04/24 08:20:47 mtm Exp $
-# $DragonFly: src/etc/rc.d/hostname,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/hostname,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: hostname
 # REQUIRE: mountcritlocal tty
 # BEFORE:  netif
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd
index 6ca2ed9866..125078f90c 100644
--- a/etc/rc.d/inetd
+++ b/etc/rc.d/inetd
@@ -2,12 +2,12 @@
 #
 # $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $
 # $FreeBSD: src/etc/rc.d/inetd,v 1.2 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/inetd,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/inetd,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: inetd
 # REQUIRE: DAEMON LOGIN
-# KEYWORD: DragonFly FreeBSD NetBSD shutdown
+# KEYWORD: DragonFly shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/initdiskless b/etc/rc.d/initdiskless
index 24cc5e61f8..b624d88429 100644
--- a/etc/rc.d/initdiskless
+++ b/etc/rc.d/initdiskless
@@ -25,10 +25,10 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD: src/etc/rc.d/initdiskless,v 1.24 2003/06/30 21:47:06 brooks Exp $
-# $DragonFly: src/etc/rc.d/initdiskless,v 1.4 2003/12/11 23:28:41 dillon Exp $
+# $DragonFly: src/etc/rc.d/initdiskless,v 1.5 2004/01/26 17:21:15 rob Exp $
 #
 # PROVIDE: initdiskless
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 dummy_rc_command "$1"
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
index 11ff691581..91973678d9 100644
--- a/etc/rc.d/initrandom
+++ b/etc/rc.d/initrandom
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/initrandom,v 1.1 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/initrandom,v 1.3 2004/01/16 07:11:23 dillon Exp $
+# $DragonFly: src/etc/rc.d/initrandom,v 1.4 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: initrandom
 # REQUIRE: initdiskless
 # BEFORE: disks
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ip6fw b/etc/rc.d/ip6fw
index b5807003ff..e873064d34 100644
--- a/etc/rc.d/ip6fw
+++ b/etc/rc.d/ip6fw
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/ip6fw,v 1.3 2003/06/29 05:15:57 mtm Exp $
-# $DragonFly: src/etc/rc.d/ip6fw,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/ip6fw,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ip6fw
 # REQUIRE: routing
 # BEFORE: network_ipv6
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter
index 0143e52ff1..6eb806cf27 100644
--- a/etc/rc.d/ipfilter
+++ b/etc/rc.d/ipfilter
@@ -2,13 +2,13 @@
 #
 # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $
 # $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipfilter,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/ipfilter,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ipfilter
 # REQUIRE: root beforenetlkm mountcritlocal tty ipmon
 # BEFORE:  netif
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -16,18 +16,7 @@ name="ipfilter"
 rcvar=`set_rcvar`
 load_rc_config $name
 
-case ${OSTYPE} in
-DragonFly)
 	stop_precmd="test -f ${ipfilter_rules} -o -f ${ipv6_ipfilter_rules}"
-	;;
-
-FreeBSD)
-	stop_precmd="test -f ${ipfilter_rules} -o -f ${ipv6_ipfilter_rules}"
-	;;
-NetBSD)
-	stop_precmd="test -f /etc/ipf.conf -o -f /etc/ipf6.conf"
-	;;
-esac
 
 start_precmd="ipfilter_prestart"
 start_cmd="ipfilter_start"
@@ -42,8 +31,6 @@ extra_commands="reload resync status"
 
 ipfilter_prestart()
 {
-case ${OSTYPE} in
-DragonFly)
 	 # load ipfilter kernel module if needed
 	if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then
 		if kldload ipl; then
@@ -58,49 +45,12 @@ DragonFly)
 		warn 'IP-filter: NO IPF RULES'
 		return 1
 	fi
-	;;
-
-FreeBSD)
-	# load ipfilter kernel module if needed
-	if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then
-		if kldload ipl; then
-			info 'IP-filter module loaded.'
-		else
-			err 1 'IP-filter module failed to load.'
-		fi
-	fi
-
-	# check for ipfilter rules
-	if [ ! -r "${ipfilter_rules}" ] && [ ! -r "${ipv6_ipfilter_rules}" ]
-	then
-		warn 'IP-filter: NO IPF RULES'
-		return 1
-	fi
-	;;
-NetBSD)
-	if [ ! -f /etc/ipf.conf ] && [ ! -f /etc/ipf6.conf ]; then
-		warn "/etc/ipf*.conf not readable; ipfilter start aborted."
-			#
-			# If booting directly to multiuser, send SIGTERM to
-			# the parent (/etc/rc) to abort the boot
-			#
-		if [ "$autoboot" = yes ]; then
-			echo "ERROR: ABORTING BOOT (sending SIGTERM to parent)!"
-			kill -TERM $$
-			exit 1
-		fi
-		return 1
-	fi
-	;;
-esac
 	return 0
 }
 
 ipfilter_start()
 {
 	echo "Enabling ipfilter."
-	case ${OSTYPE} in
-	DragonFly)
 		${ipfilter_program:-/sbin/ipf} -EFa
 		if [ -r "${ipfilter_rules}" ]; then
 			${ipfilter_program:-/sbin/ipf} \
@@ -111,46 +61,12 @@ ipfilter_start()
 			${ipfilter_program:-/sbin/ipf} -6 \
 			-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
 		fi
-;;
-
-	FreeBSD)
-		${ipfilter_program:-/sbin/ipf} -EFa
-		if [ -r "${ipfilter_rules}" ]; then
-			${ipfilter_program:-/sbin/ipf} \
-			    -f "${ipfilter_rules}" ${ipfilter_flags}
-		fi
-		${ipfilter_program:-/sbin/ipf} -6 -EFa
-		if [ -r "${ipv6_ipfilter_rules}" ]; then
-			${ipfilter_program:-/sbin/ipf} -6 \
-			    -f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
-		fi
-		;;
-	NetBSD)
-		/sbin/ipf -E -Fa
-		if [ -f /etc/ipf.conf ]; then
-			/sbin/ipf -f /etc/ipf.conf
-		fi
-		if [ -f /etc/ipf6.conf ]; then
-			/sbin/ipf -6 -f /etc/ipf6.conf
-		fi
-		;;
-	esac
 }
 
 ipfilter_stop()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		echo "Saving firewall state tables"
-		${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags}
-		;;
-	FreeBSD)
 		echo "Saving firewall state tables"
 		${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags}
-		;;
-	NetBSD)
-		;;
-	esac
 	# XXX - The following command is not effective for 'lkm's
 	echo "Disabling ipfilter."
 	/sbin/ipf -D
@@ -160,8 +76,6 @@ ipfilter_reload()
 {
 	echo "Reloading ipfilter rules."
 
-	case ${OSTYPE} in
-	DragonFly)
 		 ${ipfilter_program:-/sbin/ipf} -I -Fa
 		if [ -r "${ipfilter_rules}" ]; then
 			${ipfilter_program:-/sbin/ipf} -I \
@@ -173,49 +87,14 @@ ipfilter_reload()
 			-f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
 		fi
 		${ipfilter_program:-/sbin/ipf} -s
-		;;
-	FreeBSD)
-		${ipfilter_program:-/sbin/ipf} -I -Fa
-		if [ -r "${ipfilter_rules}" ]; then
-			${ipfilter_program:-/sbin/ipf} -I \
-			    -f "${ipfilter_rules}" ${ipfilter_flags}
-		fi
-		${ipfilter_program:-/sbin/ipf} -I -6 -Fa
-		if [ -r "${ipv6_ipfilter_rules}" ]; then
-			${ipfilter_program:-/sbin/ipf} -I -6 \
-			    -f "${ipv6_ipfilter_rules}" ${ipfilter_flags}
-		fi
-		${ipfilter_program:-/sbin/ipf} -s
-		;;
-	NetBSD)
-		/sbin/ipf -I -Fa
-		if [ -f /etc/ipf.conf ] && ! /sbin/ipf -I -f /etc/ipf.conf; then
-			err 1 "reload of ipf.conf failed; not swapping to" \
-			    " new ruleset."
-		fi
-		if [ -f /etc/ipf6.conf ] && \
-		    ! /sbin/ipf -I -6 -f /etc/ipf6.conf; then
-			err 1 "reload of ipf6.conf failed; not swapping to" \
-			    " new ruleset."
-		fi
 		/sbin/ipf -s
-		;;
-	esac
 
 }
 
 ipfilter_resync()
 {
-	case ${OSTYPE} in
-	DragonFly)
-		# Don't resync if ipfilter is not loaded
-		[ sysctl net.inet.ipf.fr_pass > /dev/null 2>&1 ] && return
-		;;
-	FreeBSD)
 		# Don't resync if ipfilter is not loaded
 		[ sysctl net.inet.ipf.fr_pass > /dev/null 2>&1 ] && return
-		;;
-	esac
 	${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags}
 }
 
diff --git a/etc/rc.d/ipfs b/etc/rc.d/ipfs
index bcf9b30179..bd6edef1b1 100644
--- a/etc/rc.d/ipfs
+++ b/etc/rc.d/ipfs
@@ -2,13 +2,13 @@
 #
 # $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $
 # $FreeBSD: src/etc/rc.d/ipfs,v 1.2 2003/04/24 08:20:47 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipfs,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/ipfs,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ipfs
 # REQUIRE: ipnat
 # BEFORE:  netif
-# KEYWORD: DragonFly FreeBSD NetBSD shutdown
+# KEYWORD: DragonFly shutdown
 
 . /etc/rc.subr
 
@@ -16,17 +16,7 @@ name="ipfs"
 rcvar=`set_rcvar`
 start_cmd="ipfs_start"
 stop_cmd="ipfs_stop"
-case ${OSTYPE} in
-DragonFly)
 	start_precmd="ipfs_prestart"
-	;;
-FreeBSD)
-	start_precmd="ipfs_prestart"
-	;;
-NetBSD)
-	ipfs_program="/usr/sbin/ipfs"
-	;;
-esac
 
 ipfs_prestart()
 {
diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw
index 2050084212..573b7f3769 100644
--- a/etc/rc.d/ipfw
+++ b/etc/rc.d/ipfw
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/ipfw,v 1.4 2003/03/30 15:52:18 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipfw,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/ipfw,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ipfw
 # REQUIRE: ppp-user
 # BEFORE: NETWORKING
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon
index 47650cfcd0..181b828973 100644
--- a/etc/rc.d/ipmon
+++ b/etc/rc.d/ipmon
@@ -2,7 +2,7 @@
 #
 # $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $
 # $FreeBSD: src/etc/rc.d/ipmon,v 1.6 2003/07/14 13:02:36 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipmon,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/ipmon,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ipmon
@@ -15,19 +15,8 @@
 name="ipmon"
 rcvar=`set_rcvar`
 
-case ${OSTYPE} in
-DragonFly)
 	command="/sbin/ipmon"
 	start_precmd="ipmon_precmd"
-	;;
-FreeBSD)
-	command="/sbin/ipmon"
-	start_precmd="ipmon_precmd"
-	;;
-NetBSD)
-	command="/usr/sbin/${name}"
-	command_args="-D"
-esac
 
 ipmon_precmd()
 {
diff --git a/etc/rc.d/ipnat b/etc/rc.d/ipnat
index 7cd2f12e25..251ee9c0b7 100644
--- a/etc/rc.d/ipnat
+++ b/etc/rc.d/ipnat
@@ -2,13 +2,13 @@
 #
 # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $
 # $FreeBSD: src/etc/rc.d/ipnat,v 1.8 2003/04/30 02:54:17 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipnat,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/ipnat,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ipnat
 # REQUIRE: ipfilter
 # BEFORE:  DAEMON netif
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
@@ -16,13 +16,6 @@ name="ipnat"
 rcvar=`set_rcvar`
 load_rc_config $name
 
-case ${OSTYPE} in
-NetBSD)
-	ipnat_flags=
-	ipnat_rules="/etc/ipnat.conf"
-	ipnat_program="/usr/sbin/ipnat"
-	;;
-esac
 
 start_precmd="ipnat_precmd"
 start_cmd="ipnat_start"
@@ -32,15 +25,6 @@ extra_commands="reload"
 
 ipnat_precmd()
 {
-	case ${OSTYPE} in
-	NetBSD)
-		if ! checkyesno ipfilter || [ ! -f /etc/ipf.conf ]; then	
-			echo "Enabling ipfilter for NAT."
-			/sbin/ipf -E -Fa
-		fi
-		return 0
-		;;
-	esac
 
 	# Make sure ipfilter is loaded before continuing
 	if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then
diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec
index 3c19a71479..5698e36ef2 100644
--- a/etc/rc.d/ipsec
+++ b/etc/rc.d/ipsec
@@ -2,13 +2,13 @@
 #
 # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/ipsec,v 1.5 2003/02/16 20:46:08 mtm Exp $
-# $DragonFly: src/etc/rc.d/ipsec,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/ipsec,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ipsec
 # REQUIRE: root beforenetlkm mountcritlocal tty
 # BEFORE:  DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 #	it does not really require beforenetlkm.
 
@@ -22,22 +22,8 @@ stop_precmd="test -f /etc/ipsec.conf"
 stop_cmd="ipsec_stop"
 reload_cmd="ipsec_reload"
 extra_commands="reload"
-
-case ${OSTYPE} in
-DragonFly)
-	ipsec_program="/usr/sbin/setkey"
-	# ipsec_file is set by rc.conf
-	;;
-
-FreeBSD)
-	ipsec_program="/usr/sbin/setkey"
-	# ipsec_file is set by rc.conf
-	;;
-NetBSD)
-	ipsec_program="/sbin/setkey"
-	ipsec_file="/etc/ipsec.conf"
-	;;
-esac
+ipsec_program="/usr/sbin/setkey"
+# ipsec_file is set by rc.conf
 
 ipsec_prestart()
 {
diff --git a/etc/rc.d/ipxrouted b/etc/rc.d/ipxrouted
index c4330c472b..7773171338 100644
--- a/etc/rc.d/ipxrouted
+++ b/etc/rc.d/ipxrouted
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/ipxrouted,v 1.1 2002/06/13 22:14:36 gordon Exp $
-# $DragonFly: src/etc/rc.d/ipxrouted,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/ipxrouted,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ipxrouted
 # REQUIRE: SERVERS
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd
index 63bbdd60d7..ac0ae01b9e 100644
--- a/etc/rc.d/isdnd
+++ b/etc/rc.d/isdnd
@@ -2,33 +2,21 @@
 #
 # $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $
 # $FreeBSD: src/etc/rc.d/isdnd,v 1.15 2003/07/15 12:39:37 mtm Exp $
-# $DragonFly: src/etc/rc.d/isdnd,v 1.2 2003/11/19 10:32:45 eirikn Exp $
+# $DragonFly: src/etc/rc.d/isdnd,v 1.3 2004/01/26 17:21:15 rob Exp $
 #
 # Mostly based on original script (/etc/rc.isdn) written by  Hellmuth Michaelis
 #
 
 # PROVIDE: isdnd
 # REQUIRE: netif mountcritlocal
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
 name="isdnd"
 rcvar=`set_rcvar isdn`
 pidfile="/var/run/${name}.pid"
-
-case ${OSTYPE} in
-DragonFly)
-	start_cmd="isdnd_start"
-	;;
-FreeBSD)
-	start_cmd="isdnd_start"
-	;;
-NetBSD)
-	command="/usr/sbin/${name}"
-	required_files="/etc/isdn/${name}.rc"
-	;;
-esac
+start_cmd="isdnd_start"
 
 isdnd_start()
 {
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 71b751679b..f3da1f5140 100644
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $
-# $DragonFly: src/etc/rc.d/jail,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/jail,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: jail
 # REQUIRE: LOGIN
 # BEFORE: securelevel
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/kadmind b/etc/rc.d/kadmind
index b601a51663..a4ff362105 100644
--- a/etc/rc.d/kadmind
+++ b/etc/rc.d/kadmind
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/kadmind,v 1.3 2003/03/08 09:50:10 markm Exp $
-# $DragonFly: src/etc/rc.d/kadmind,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/kadmind,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: kadmin
 # REQUIRE: kerberos
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/kerberos b/etc/rc.d/kerberos
index 5217217ae0..cb413e635f 100644
--- a/etc/rc.d/kerberos
+++ b/etc/rc.d/kerberos
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/kerberos,v 1.3 2003/03/08 09:50:10 markm Exp $
-# $DragonFly: src/etc/rc.d/kerberos,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/kerberos,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: kerberos
 # REQUIRE: NETWORKING
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/keyserv b/etc/rc.d/keyserv
index 16f758597e..6de0d94cbb 100644
--- a/etc/rc.d/keyserv
+++ b/etc/rc.d/keyserv
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/keyserv,v 1.2 2002/08/14 05:44:32 gordon Exp $
-# $DragonFly: src/etc/rc.d/keyserv,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/keyserv,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # Start keyserv if we are running Secure RPC
@@ -10,7 +10,7 @@
 # PROVIDE: keyserv
 # REQUIRE: ypbind
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/kldxref b/etc/rc.d/kldxref
index 087cb9b87e..f4f65759d2 100644
--- a/etc/rc.d/kldxref
+++ b/etc/rc.d/kldxref
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/kldxref,v 1.2 2003/04/18 17:55:05 mtm Exp $
-# $DragonFly: src/etc/rc.d/Attic/kldxref,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/Attic/kldxref,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: kldxref
 # REQUIRE: root mountcritlocal
 # BEFORE:  netif
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly 
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd
index 479504672f..e09ea3268a 100644
--- a/etc/rc.d/kpasswdd
+++ b/etc/rc.d/kpasswdd
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 # $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $
-# $DragonFly: src/etc/rc.d/kpasswdd,v 1.1 2003/07/24 06:35:37 dillon Exp $
+# $DragonFly: src/etc/rc.d/kpasswdd,v 1.2 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: kpasswdd
 # REQUIRE: kadmin
 # BEFORE: DAEMON
-# KEYWORD: DragonFly FreeBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 35f72c4df8..96bb3519b0 100644
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -2,13 +2,13 @@
 #
 # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
 # $FreeBSD: src/etc/rc.d/ldconfig,v 1.7 2003/06/30 15:02:05 trhodes Exp $
-# $DragonFly: src/etc/rc.d/ldconfig,v 1.3 2004/01/16 07:45:18 dillon Exp $
+# $DragonFly: src/etc/rc.d/ldconfig,v 1.4 2004/01/26 17:21:15 rob Exp $
 #
 
 # PROVIDE: ldconfig
 # REQUIRE: mountall mountcritremote
 # BEFORE:  DAEMON
-# KEYWORD: DragonFly FreeBSD NetBSD
+# KEYWORD: DragonFly
 
 . /etc/rc.subr
 
@@ -19,8 +19,6 @@ stop_cmd=":"
 
 ldconfig_start()
 {
-	case ${OSTYPE} in
-	DragonFly)
 		_ins=
 		ldconfig=${ldconfig_command}
 		checkyesno ldconfig_insecure && _ins="-i"
@@ -49,48 +47,6 @@ ldconfig_start()
 				;;
 			esac
 		fi
-		;;
-
-	FreeBSD)
-		_ins=
-		ldconfig=${ldconfig_command}
-		checkyesno ldconfig_insecure && _ins="-i"
-		if [ -x "${ldconfig_command}" ]; then
-			_LDC=/usr/lib
-			for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
-				if [ -r "${i}" ]; then
-					_LDC="${_LDC} ${i}"
-				fi
-			done
-			echo 'ELF ldconfig path:' ${_LDC}
-			${ldconfig} -elf ${_ins} ${_LDC}
-
-			# Legacy aout support for i386 only
-			case `sysctl -n hw.machine_arch` in
-			i386)
-				# Default the a.out ldconfig path.
-				: ${ldconfig_paths_aout=${ldconfig_paths}}
-				_LDC=/usr/lib/aout
-				for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
-					if [ -r "${i}" ]; then
-						_LDC="${_LDC} ${i}"
-					fi
-				done
-				echo 'a.out ldconfig path:' ${_LDC}
-				${ldconfig} -aout ${_ins} ${_LDC}
-				;;
-			esac
-		fi
-		;;
-	NetBSD)
-		if [ -f ${ldconfig_command} ]; then
-			echo "Creating a.out runtime link editor directory cache."
-			${ldconfig_command}
-		fi
-		;;
-	*)
-		;;
-	esac
 }
 
 load_rc_config $name
-- 
2.41.0