From bf98eb7293f056f3608d77896f2c62b3a643fda1 Mon Sep 17 00:00:00 2001
From: cvs2svn <cvs2svn@FreeBSD.org>
Date: Thu, 13 Jun 2002 22:14:38 +0000
Subject: [PATCH 1/2] This commit was manufactured by cvs2svn to create branch
 'NETBSD'.

---
 etc/rc.d/NETWORKING | 12 ++++++++++++
 etc/rc.d/altqd      | 22 +++++++++++++++++++++
 etc/rc.d/moused     | 47 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 etc/rc.d/NETWORKING
 create mode 100644 etc/rc.d/altqd
 create mode 100644 etc/rc.d/moused

diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
new file mode 100644
index 000000000000..ca23df345780
--- /dev/null
+++ b/etc/rc.d/NETWORKING
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $
+# $FreeBSD$
+#
+
+# PROVIDE: NETWORKING NETWORK
+# REQUIRE: network dhclient altqd network1 network2 network_ipv6 ppp-user
+# KEYWORD: FreeBSD NetBSD
+
+#	This is a dummy dependancy, for services which require networking
+#	to be operational before starting.
diff --git a/etc/rc.d/altqd b/etc/rc.d/altqd
new file mode 100644
index 000000000000..c7e626e13bae
--- /dev/null
+++ b/etc/rc.d/altqd
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# $NetBSD: altqd,v 1.2 2002/03/22 04:33:58 thorpej Exp $
+# $FreeBSD$
+#
+
+# PROVIDE: altqd
+# REQUIRE: network mountcritlocal dhclient
+# BEFORE:  NETWORKING
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+name="altqd"
+rcvar=$name
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="/etc/altq.conf"
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/etc/rc.d/moused b/etc/rc.d/moused
new file mode 100644
index 000000000000..bd42e9ffb191
--- /dev/null
+++ b/etc/rc.d/moused
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $
+# $FreeBSD$
+#
+
+# PROVIDE: moused
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD NetBSD
+
+. /etc/rc.subr
+
+name=moused
+rcvar=`set_rcvar`
+
+case `${CMD_OSTYPE}` in
+FreeBSD)
+	start_cmd="moused_start"
+	;;
+NetBSD)
+	command="/usr/sbin/${name}"
+	;;
+esac
+
+moused_start()
+{
+	echo -n 'Starting moused:'
+	/usr/sbin/moused ${moused_flags} -p ${moused_port} -t ${moused_type}
+
+	_mousechar_arg=
+	case ${mousechar_start} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		echo -n ' mousechar_start'
+		_mousechar_arg="-M ${mousechar_start}"
+		;;
+	esac
+
+	for ttyv in /dev/ttyv* ; do
+		vidcontrol < ${ttyv} ${_mousechar_arg} -m on
+	done
+	echo '.'
+}
+
+load_rc_config $name
+run_rc_command "$1"

From b025a2f79b172cdfb37414c3f020d428f23f75cb Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Fri, 21 Jun 2002 15:56:16 +0000
Subject: [PATCH 2/2] Sync with NetBSD. * don't whine about non-regular files.
 It is perfectly normal to keep a   CVS or RCS directory in /etc/rc.d. *
 manpage tweak

---
 sbin/rcorder/rcorder.8 | 4 ++--
 sbin/rcorder/rcorder.c | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8
index 2ba623b69b17..031e4c91646f 100644
--- a/sbin/rcorder/rcorder.8
+++ b/sbin/rcorder/rcorder.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rcorder.8,v 1.2 2000/07/05 15:45:30 msaitoh Exp $
+.\"	$NetBSD: rcorder.8,v 1.3 2000/07/17 14:16:22 mrg Exp $
 .\"
 .\" Copyright (c) 1998
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -81,7 +81,7 @@ separated by whitespace. Multiple
 .Dq BEFORE
 and
 .Dq KEYWORD
-lines may appear, but all such lines must appear in a sequence without 
+lines may appear, but all such lines must appear in a sequence without
 any intervening lines, as once a line that does not follow the format
 is reached, parsing stops.
 .Pp
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 03a397f2b690..4c846e82327a 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rcorder.c,v 1.6 2000/07/19 09:58:03 enami Exp $	*/
+/*	$NetBSD: rcorder.c,v 1.7 2000/08/04 07:33:55 enami Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Matthew R. Green
@@ -480,7 +480,9 @@ crunch_file(filename)
 	}
 
 	if (!S_ISREG(st.st_mode)) {
+#if 0
 		warnx("%s is not a file", filename);
+#endif
 		fclose(fp);
 		return;
 	}