Tarted up the init scripts.

Package-Manager: portage-2.1.2_pre2-r2

8 files changed, 152 insertions, 86 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 1323a67bd710..fdc0182a00c0 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.18 2006/10/01 20:14:01 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.19 2006/10/03 14:43:39 uberlord Exp $
+
+  03 Oct 2006; Roy Marples <uberlord@gentoo.org> files/moused.confd,
+  files/moused.initd, files/powerd.initd, files/rpcbind.initd,
+  files/syscons.initd, files/syslogd.initd:
+  Tarted up the init scripts.
+  moused can now be optionally multiplexed like the net scripts.
 
   01 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
   +files/freebsd-usbin-adduser.patch, freebsd-usbin-6.1-r1.ebuild,
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index e18255ef8b94..bdd7677d75ea 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -22,14 +22,14 @@ AUX freebsd-usbin-nowrap.patch 1229 RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae3165407
 MD5 39d0d0915156088d99b1524fc39e8ebd files/freebsd-usbin-nowrap.patch 1229
 RMD160 2931c7cc81e6dcffdbdd9ea98ff5ae31654070cf files/freebsd-usbin-nowrap.patch 1229
 SHA256 4ae0724d5e642e0399188b6805e94495af360ccf4f99443f9bfa80c220d29a8b files/freebsd-usbin-nowrap.patch 1229
-AUX moused.confd 511 RMD160 8b07a32ee21ee6fe35b7bc670feee63bf447798a SHA1 93b740b9057e071052c64756bb0c965f9fe16100 SHA256 05f0df43cf6dd26edf7d64d3312d04caa39093747ccefc5009a8f4fb9772d31c
-MD5 9712e83e404e19336741468f1a872630 files/moused.confd 511
-RMD160 8b07a32ee21ee6fe35b7bc670feee63bf447798a files/moused.confd 511
-SHA256 05f0df43cf6dd26edf7d64d3312d04caa39093747ccefc5009a8f4fb9772d31c files/moused.confd 511
-AUX moused.initd 847 RMD160 2b1424a2c676cc325a7529ec867d9dd4870e0731 SHA1 84bbaf94ff71989ec159a2465641dd442c61f8d3 SHA256 8ffdb72c34e890389e48fcf830925fad7ea01cb08dca9d6273e03181cf0c28ec
-MD5 0fbf1d7060462ac7106dd1caa4c3826f files/moused.initd 847
-RMD160 2b1424a2c676cc325a7529ec867d9dd4870e0731 files/moused.initd 847
-SHA256 8ffdb72c34e890389e48fcf830925fad7ea01cb08dca9d6273e03181cf0c28ec files/moused.initd 847
+AUX moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e SHA1 e09f3f44ee29fa75a1ce6fbe9cdbfe503eaa11d6 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e
+MD5 820d1c2ee0ee1c6d0c000b333a50001f files/moused.confd 827
+RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e files/moused.confd 827
+SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e files/moused.confd 827
+AUX moused.initd 1767 RMD160 ecdf0f04fa4501707dca856b225f04c232c3b098 SHA1 8ae87c09f6127735ecaa90a46b2b662021a460e9 SHA256 006d7135984e8c96ddeb6f6b93878d28011aeedcf4c7b8d612b9329565da4f9a
+MD5 c78a687f69b27e116228c1498dd1192b files/moused.initd 1767
+RMD160 ecdf0f04fa4501707dca856b225f04c232c3b098 files/moused.initd 1767
+SHA256 006d7135984e8c96ddeb6f6b93878d28011aeedcf4c7b8d612b9329565da4f9a files/moused.initd 1767
 AUX nfs.confd 589 RMD160 6ba14cb8218bf7ea16eb6274885dc92e1a84803c SHA1 6f3e0701c3a5bbaaa341f1744ddddb2ff755d30d SHA256 642ff72e941722b6c235bb4a8c4f8bbb9444866559e65b55032e0206d9a970a5
 MD5 4855fe0bc6e7d9a037631453e024fa20 files/nfs.confd 589
 RMD160 6ba14cb8218bf7ea16eb6274885dc92e1a84803c files/nfs.confd 589
@@ -46,30 +46,30 @@ AUX powerd.confd 331 RMD160 10cc4cc9e57107e56139c640f6124ee55cfb7773 SHA1 6a82b5
 MD5 f990bf3b2683b294bc6979888fa43109 files/powerd.confd 331
 RMD160 10cc4cc9e57107e56139c640f6124ee55cfb7773 files/powerd.confd 331
 SHA256 cd8f431965cb29c71f10e5be36ef4d9105eba1e022902a3c842b8133e3132385 files/powerd.confd 331
-AUX powerd.initd 588 RMD160 d92bc58d13dc19ef8eee8bfea3492f56efef9eeb SHA1 444bf1a29d332990b51598b177554abbc2b9bbef SHA256 e0345ed8dd8a81669f97be9ae3a0e03fd75dc791950472ae8f26bd885735b2d0
-MD5 b21cb52a3e6066871b5f65e621f1d843 files/powerd.initd 588
-RMD160 d92bc58d13dc19ef8eee8bfea3492f56efef9eeb files/powerd.initd 588
-SHA256 e0345ed8dd8a81669f97be9ae3a0e03fd75dc791950472ae8f26bd885735b2d0 files/powerd.initd 588
+AUX powerd.initd 778 RMD160 5389d68efc0fc8bc7c36a1c5a4203c0ed5ca0676 SHA1 e84a4d800e1b899e2219ac5bd9c43d5051ed645c SHA256 ed8003a8c8c3aa6839d4619539ba717d89487a64280aaa76d2da4f1162762b08
+MD5 093927097eb1b3cfb41163265ba62edf files/powerd.initd 778
+RMD160 5389d68efc0fc8bc7c36a1c5a4203c0ed5ca0676 files/powerd.initd 778
+SHA256 ed8003a8c8c3aa6839d4619539ba717d89487a64280aaa76d2da4f1162762b08 files/powerd.initd 778
 AUX pw.conf 179 RMD160 b40103a1c85c1b5e24ad60da82741ee744e46cb8 SHA1 f08952bb60e7c85e676900b277ed51face945a0e SHA256 0aa508e3911a80ccd1dc5005ec6f2e86e7c4fc5c99ca127f4d7e479d133c69ef
 MD5 990afbd0fae94ba8dc2e77ad70bed008 files/pw.conf 179
 RMD160 b40103a1c85c1b5e24ad60da82741ee744e46cb8 files/pw.conf 179
 SHA256 0aa508e3911a80ccd1dc5005ec6f2e86e7c4fc5c99ca127f4d7e479d133c69ef files/pw.conf 179
-AUX rpcbind.initd 623 RMD160 165126a8f2953d157a6fdffe1d3fea106209c3a8 SHA1 d441a1b88177710ef395fbd31ee28112990ea62f SHA256 e36107e46fe91229ee5594791d26dea9b5f9364042477d27c3817b4f8f2b0dd3
-MD5 ac7b921937d1d0c3eef9f829269a9f7a files/rpcbind.initd 623
-RMD160 165126a8f2953d157a6fdffe1d3fea106209c3a8 files/rpcbind.initd 623
-SHA256 e36107e46fe91229ee5594791d26dea9b5f9364042477d27c3817b4f8f2b0dd3 files/rpcbind.initd 623
+AUX rpcbind.initd 639 RMD160 3901302ea80d110a83404a883c9ce32b8eb5dce1 SHA1 4d8109881c9a6893a860f191bb2fb51ddbffedb3 SHA256 435dbc12922affda1e915abf7fa2ae524e7637586832002404fe264570f0ff57
+MD5 a416276060ff5fb771144bb9cf98fc34 files/rpcbind.initd 639
+RMD160 3901302ea80d110a83404a883c9ce32b8eb5dce1 files/rpcbind.initd 639
+SHA256 435dbc12922affda1e915abf7fa2ae524e7637586832002404fe264570f0ff57 files/rpcbind.initd 639
 AUX syscons.confd 464 RMD160 c9673b5f9f92443a6afb7276db0f0e163044ac4d SHA1 5b753c59b3b09ee648dafb763fbdc348c9d68e7e SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b1013ce02e44ee
 MD5 88a74d774fdf5505022d26aa69a61376 files/syscons.confd 464
 RMD160 c9673b5f9f92443a6afb7276db0f0e163044ac4d files/syscons.confd 464
 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b1013ce02e44ee files/syscons.confd 464
-AUX syscons.initd 1421 RMD160 d4d0243d703504af43ddd577c494811e8645127b SHA1 9e15b1849c126613703caabb36c3cb1e8ff65fda SHA256 b42742db2bb755e5e09e6efbced0bdcd59357f4aef7489d0fb039f423b947950
-MD5 369451baf0d5170a529d35f4eb09d1a5 files/syscons.initd 1421
-RMD160 d4d0243d703504af43ddd577c494811e8645127b files/syscons.initd 1421
-SHA256 b42742db2bb755e5e09e6efbced0bdcd59357f4aef7489d0fb039f423b947950 files/syscons.initd 1421
-AUX syslogd.initd 574 RMD160 4dfc927915b794809d9570079a6fe1adf2ba8520 SHA1 862854ea95f7c5b35dda26030c16b5a996feafc6 SHA256 6532f12605e9f961c4e758a126db87428365779430a8e98644201bdded19461f
-MD5 26bce1f4cc64c909807fecd318973e2a files/syslogd.initd 574
-RMD160 4dfc927915b794809d9570079a6fe1adf2ba8520 files/syslogd.initd 574
-SHA256 6532f12605e9f961c4e758a126db87428365779430a8e98644201bdded19461f files/syslogd.initd 574
+AUX syscons.initd 1610 RMD160 c744033fc2efd1157cbbc90c3289e652c238d8ac SHA1 ee1c149c3dc3f534105e244e29befd19beb0bc1e SHA256 014af9d58133a730fa0b8b385967e82ad4e3b0ac725964204b3b9743cdbbfdee
+MD5 054ea5a85b03d6742599b45f8fccbf9b files/syscons.initd 1610
+RMD160 c744033fc2efd1157cbbc90c3289e652c238d8ac files/syscons.initd 1610
+SHA256 014af9d58133a730fa0b8b385967e82ad4e3b0ac725964204b3b9743cdbbfdee files/syscons.initd 1610
+AUX syslogd.initd 573 RMD160 76333e56a971d1f1a3f8d1cec523662d01255c6f SHA1 22472c0d36f2ddf35cbcf887697de42ad21426aa SHA256 32079c481847728f4cd182a7957edb2cbb21606ecae9dfab2b4f8ceb8ad7a3ac
+MD5 48a59f2d635b32605288394a094e9e0b files/syslogd.initd 573
+RMD160 76333e56a971d1f1a3f8d1cec523662d01255c6f files/syslogd.initd 573
+SHA256 32079c481847728f4cd182a7957edb2cbb21606ecae9dfab2b4f8ceb8ad7a3ac files/syslogd.initd 573
 DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA1 adac960daad3f4169874fe0ba1050fe7e906aa23 SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054
 DIST freebsd-contrib-6.2_beta1.tar.bz2 36459773 RMD160 c7e56dab7c678c780f1154f14aef6d9647845456 SHA1 e89558b69abacb19c2f835f8e0279fe02deb6c09 SHA256 c0a88479b5472c9085aa04d7b39735b8001e559fb7645c07821f4466344c865d
 DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA1 4a1fff7fa1c77485c5efccf5ab1155e497d1cd82 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7
@@ -92,10 +92,10 @@ EBUILD freebsd-usbin-6.2_beta1.ebuild 4563 RMD160 3268062c9c54132a02eb97564da52f
 MD5 361c3c809ad8ba1a63ec2f8e12329bf1 freebsd-usbin-6.2_beta1.ebuild 4563
 RMD160 3268062c9c54132a02eb97564da52f61808f8db1 freebsd-usbin-6.2_beta1.ebuild 4563
 SHA256 f3ab10dcc542a3d5dc37b1ac59d108fb8e746f6ebb306cf925cc2ab5a22a69b5 freebsd-usbin-6.2_beta1.ebuild 4563
-MISC ChangeLog 9915 RMD160 be78db22e0c0d56c0542ee7d3da26aca5d749f7d SHA1 66d919474979518aab61e7402864a367c635d5c2 SHA256 105b32bdc2c965f6ffacbd8e31573f3cda1506bb29569f735415dc4f41796e45
-MD5 f9941fd5975431607ac24af69eee8ca0 ChangeLog 9915
-RMD160 be78db22e0c0d56c0542ee7d3da26aca5d749f7d ChangeLog 9915
-SHA256 105b32bdc2c965f6ffacbd8e31573f3cda1506bb29569f735415dc4f41796e45 ChangeLog 9915
+MISC ChangeLog 10187 RMD160 5235c9bcdcf0617d6697e30d903b72e69255a833 SHA1 93ea12065a49967a6df1acf8dfaa2fdc2d9ed7ea SHA256 68473658203fb3e89a1bb3e5a14302ce34714edbbecfb8c04b9dfa47502de4c0
+MD5 224cb4e2e0b6ffb1258367ebe89cd175 ChangeLog 10187
+RMD160 5235c9bcdcf0617d6697e30d903b72e69255a833 ChangeLog 10187
+SHA256 68473658203fb3e89a1bb3e5a14302ce34714edbbecfb8c04b9dfa47502de4c0 ChangeLog 10187
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd
index 3bb4400e3119..fea968bb8e4c 100644
--- a/sys-freebsd/freebsd-usbin/files/moused.confd
+++ b/sys-freebsd/freebsd-usbin/files/moused.confd
@@ -1,11 +1,20 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.confd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.confd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
 
-moused_type="auto"       # See man page for rc.conf(5) for available settings.
+# See the moused man page for available settings.
 
-moused_port="/dev/ums0" # Set to your mouse port.
+# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports
+# Leave blank to try to autodetect it
+MOUSED_DEVICE=""
 
-moused_flags=""         # Any additional flags to moused.
+# Any additional flags requires
+MOUSED_FLAGS=""
 
-mousechar_start=""    	# if 0xd0-0xd3 default range is occupied in your
-                        # language code table, specify alternative range
-			# start like mousechar_start=3, see vidcontrol(1)
+# If 0xd0-0xd3 default range is occupied in your language code table, specify
+# alternative range start like MOUSECHAR_START="3", see vidcontrol(1)
+MOUSECHAR_START=""
+
+# You can also multiplex the init script for each device like so
+#   ln -s moused /etc/init.d/moused.ums0
+# This enables you to have a config file per mouse (forces MOUSED_DEVICE
+# to ums0 in this case) and control each mouse.
+# devd can also start and stop these mice, which laptop users will find handy.
diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd
index 06e9c2e5cd1d..19db707f1476 100644
--- a/sys-freebsd/freebsd-usbin/files/moused.initd
+++ b/sys-freebsd/freebsd-usbin/files/moused.initd
@@ -1,33 +1,65 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
 
+MOUSED_NAME="${SVCNAME##*.}"
+if [[ -n ${MOUSED_NAME} && ${MOUSED_NAME} != "moused" ]] ; then
+	MOUSED_DEVICE="/dev/${MOUSED_NAME}"
+	MOUSED_PIDFILE="/var/run/moused-${MOUSED_NAME}.pid"
+else
+	MOUSED_NAME=
+	MOUSED_PIDFILE="/var/run/moused.pid"
+fi
+
+depend() {
+	need localmount 
+}
 
 start() {
-	ebegin "Starting Moused"
-	
+	ebegin $"Starting the Console Mouse Daemon" "${MOUSED_NAME}"
+
+	if [[ -z ${MOUSED_DEVICE} ]] ; then
+		for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do
+			if [[ -e ${x} && \
+			! -e /var/run/moused-$(basename "${x}").pid ]] ; then
+				MOUSED_DEVICE="${x}"
+				eindent
+				einfo "Using mouse on ${MOUSED_DEVICE}"
+				eoutdent
+				break
+			fi
+		done
+	fi
+
+	if [[ -z ${MOUSED_DEVICE} ]] ; then
+		eend 1 $"No device specified in" "/etc/conf.d/${SVCNAME}" \
+			$"and no mouse detected"
+		return 1
+	fi
+
+	local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}"
 	start-stop-daemon --start --quiet --exec /usr/sbin/moused \
-		-- ${moused_flags} -p ${moused_port} -t ${moused_type}
-	
-	retval=$?
-	
-	[[ -n ${mousechar_start} ]] && mousechar_start="-M ${mousechar_start}"
+		--pidfile "${MOUSED_PIDFILE}" \
+		-- ${opts} -I "${MOUSED_PIDFILE}"
+	local retval=$?
 	
+	[[ -n ${MOUSE_CHAR_START} ]] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}"
+	local ttyv=
 	for ttyv in /dev/ttyv* ; do
-		vidcontrol < ${ttyv} ${mousechar_start} -m on || retval=1
+		vidcontrol < ${ttyv} ${MOUSE_CHAR_START} -m on || retval=1
 	done
 	
-	eend $retval "Failed to start Moused"
+	eend ${retval} $"Failed to start moused"
 }
 
 stop() {
-	ebegin "Stopping Moused"
-	
-	start-stop-daemon --stop --quiet --pidfile /var/run/moused.pid
-	retval=$?
-	[[ -f /var/run/moused.pid ]] && rm /var/run/moused.pid
-	
-	eend $retval "Failed to stop Moused"
+	ebegin $"Stopping the Console Mouse Daemon" "${MOUSED_NAME}"
+	# Don't specify the binary as >1 instance of moused may be running
+	# which is perfectly valid as we can be multiplexed.
+	start-stop-daemon --stop --quiet --pidfile "${MOUSED_PIDFILE}"
+	eend $? $"Failed to stop moused"
 }
-			
+
+# vim: set ts=4 :
+
diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd
index 7477172e533b..03112d3535c1 100755
--- a/sys-freebsd/freebsd-usbin/files/powerd.initd
+++ b/sys-freebsd/freebsd-usbin/files/powerd.initd
@@ -1,20 +1,27 @@
 #!/sbin/runscript
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/powerd.initd,v 1.1 2006/04/14 14:15:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/powerd.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
+
+depend() {
+	need localmount
+}
 
 start() {
-	local args
-	[ -z "$BATTERY_MODE" ] || args="${args} -b ${BATTERY_MODE}"
-	[ -z "$AC_MODE" ] || args="${args} -a ${AC_MODE}"
+	local args=
+	[[ -n ${BATTERY_MODE} ]] && args="${args} -b ${BATTERY_MODE}"
+	[[ -n ${AC_MODE} ]] && args="${args} -a ${AC_MODE}"
 	
-	ebegin "Starting powerd"
-	start-stop-daemon --start --exec /usr/sbin/powerd -- ${args} $POWERD_OPTS
-	eend $?
+	ebegin $"Starting Power Control Daemon"
+	start-stop-daemon --start --exec /usr/sbin/powerd \
+		--pidfile /var/run/powerd.pid \
+		-- ${args} ${POWERD_OPTS}
+	eend $? $"Failed to start powerd"
 }
 
 stop() {
-	ebegin "Stopping powerd"
-	start-stop-daemon --stop --exec /usr/sbin/powerd
-	eend $?
+	ebegin $"Stopping Power Control Daemon"
+	start-stop-daemon --stop --exec /usr/sbin/powerd \
+		--pidfile /var/run/powerd.pid
+	eend $? $"Failed to stop powerd"
 }
diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd
index 32079f809651..9e69659e7980 100755
--- a/sys-freebsd/freebsd-usbin/files/rpcbind.initd
+++ b/sys-freebsd/freebsd-usbin/files/rpcbind.initd
@@ -1,9 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpcbind.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpcbind.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
 
 depend() {
+	need localmount
 	use net
 	before inetd
 	before xinetd
diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd
index 2ac87695d263..0bc9cda88512 100755
--- a/sys-freebsd/freebsd-usbin/files/syscons.initd
+++ b/sys-freebsd/freebsd-usbin/files/syscons.initd
@@ -1,37 +1,47 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syscons.initd,v 1.1 2006/09/14 17:03:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syscons.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
+
+depend() {
+	need localmount
+}
 
 start() {
-	ebegin "Configuring system console"
+	ebegin $"Configuring system console"
+
+	if [[ -n ${MODE} ]] ; then
+		einfo "Setting mode to ${MODE}"
+		vidcontrol "${MODE}"
+		eend $?
+	fi
 	
 	# XXX: This should handle serial consoles.
 	
 	# Set the keymap.
 	if [ -n "${KEYMAP}" ]; then
-		einfo "Setting keymap to ${KEYMAP}"
-		kbdcontrol -l ${KEYMAP}
+		einfo $"Setting keymap to" "${KEYMAP}"
+		kbdcontrol -l ${KEYMAP} < /dev/console
 	fi
 	
 	if [ -n "${KEYRATE}" ]; then
-		einfo "Setting keyrate to ${KEYRATE}"
-		kbdcontrol -r ${KEYRATE}
+		einfo $"Setting keyrate to" "${KEYRATE}"
+		kbdcontrol -r ${KEYRATE} < /dev/console
 	fi
 
 	if [ -n "${KEYCHANGE}" ]; then
-		einfo "Changing function keys..."
+		einfo $"Changing function keys..."
 		while read $a $b; do
-			kbdcontrol -f "$a" "$b"
+			kbdcontrol -f "$a" "$b" < /dev/console
 		done <<< ${KEYCHANGE}
 	fi
 	
 	if [ -n "${CURSOR}" ]; then
-		einfo "Setting cursor"
+		einfo $"Setting cursor"
 		vidcontrol -c ${CURSOR}
 	fi
 
-	einfo "Setting custom fonts..."
+	einfo $"Setting custom fonts..."
 	# Nothing to see here, move along...
 	for v in FONT8x{16,14,8}; do
 		if [ -n "${!v}" ]; then
@@ -40,7 +50,7 @@ start() {
 	done
 
 	if [ -n "${BLANKTIME}" ]; then
-		einfo "Setting blanktime"
+		einfo $"Setting blanktime"
 		vidcontrol -t ${BLANKTIME}
 	fi
 
@@ -52,11 +62,11 @@ start() {
 	fi
 
 	if [ -n "${KBDFLAGS}" ]; then
-		einfo "Setting keyboard flags for all screens"
+		einfo $"Setting keyboard flags for all screens"
 		for ttyv in /dev/ttyv*; do    
 			kbdcontrol ${KBDFLAGS} <${ttyv} &>${ttyv}
 		done
 	fi
 
-	eend
+	eend 0
 }
diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd
index fd0b2f6c1373..b0eb291e40b3 100755
--- a/sys-freebsd/freebsd-usbin/files/syslogd.initd
+++ b/sys-freebsd/freebsd-usbin/files/syslogd.initd
@@ -1,23 +1,24 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syslogd.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syslogd.initd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
 
 depend() {
-	 need localmount
+	provide logger
+	need localmount
 }
 
 start() {
-	ebegin "Starting syslogd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/syslogd
-	eend $? "Failed to start syslogd"
+	ebegin $"Starting System Logger"
+	start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \
+		-- ${SYSLOGD_OPTS}
+	eend $?
 }
 
 stop() {
-       ebegin "Stopping syslogd"
+       ebegin $"Stopping System Logger"
        start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid
-       eend $? "Failed to stop syslogd"
+       eend $?
 }