Move syscons script and configuration out of baselayout and in here.

Package-Manager: portage-2.1.1

5 files changed, 104 insertions, 15 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 459017ac232f..297f6475d45f 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2006/07/27 01:31:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.15 2006/09/14 17:03:27 flameeyes Exp $
+
+  14 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> +files/syscons.confd,
+  +files/syscons.initd, freebsd-usbin-6.1-r1.ebuild:
+  Move syscons script and configuration out of baselayout and in here.
 
   27 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   -freebsd-usbin-6.0-r3.ebuild:
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index c73a00487b5a..1f29ba928ed6 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -57,6 +57,14 @@ AUX rpcbind.initd 623 RMD160 165126a8f2953d157a6fdffe1d3fea106209c3a8 SHA1 d441a
 MD5 ac7b921937d1d0c3eef9f829269a9f7a files/rpcbind.initd 623
 RMD160 165126a8f2953d157a6fdffe1d3fea106209c3a8 files/rpcbind.initd 623
 SHA256 e36107e46fe91229ee5594791d26dea9b5f9364042477d27c3817b4f8f2b0dd3 files/rpcbind.initd 623
+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
@@ -68,14 +76,14 @@ DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f38
 DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA1 2d3d393b843e071c20fad104bc610948eac6454b SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6
 DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6
 DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e
-EBUILD freebsd-usbin-6.1-r1.ebuild 4549 RMD160 385cbc23a1d9661030c62b8e92d9b32ee908e6eb SHA1 3dcec80480854b992c60e3b8fa4ebb30d9867054 SHA256 fcf471761c862eaaeee500290cb23eb98acb9aadbc70e8bae49510198cb07a8b
-MD5 6aa4e68475820cecd4e7bb60be4ae1ce freebsd-usbin-6.1-r1.ebuild 4549
-RMD160 385cbc23a1d9661030c62b8e92d9b32ee908e6eb freebsd-usbin-6.1-r1.ebuild 4549
-SHA256 fcf471761c862eaaeee500290cb23eb98acb9aadbc70e8bae49510198cb07a8b freebsd-usbin-6.1-r1.ebuild 4549
-MISC ChangeLog 9181 RMD160 3840f57d869cebaa5bb0374d8bbef12c7914a4e4 SHA1 8ed29a430a1ba7efb9bfa1130561121218bb44f8 SHA256 461f70c5241c46e63040ce15974544447ae3cf2cf492eac7b40753bb61e1a46d
-MD5 46382d2f56b8f5d676306cb63919c4b1 ChangeLog 9181
-RMD160 3840f57d869cebaa5bb0374d8bbef12c7914a4e4 ChangeLog 9181
-SHA256 461f70c5241c46e63040ce15974544447ae3cf2cf492eac7b40753bb61e1a46d ChangeLog 9181
+EBUILD freebsd-usbin-6.1-r1.ebuild 4558 RMD160 677988721f65f8f9ae6e163b7bc6570fd5ee45c3 SHA1 6194bf335505b119d7d08df512916c88c9d34cb0 SHA256 b1902aa6cf644332b3a842f457629c51cb74e4e60d38d6e0e2dd3b6bdddbba4f
+MD5 a8239a2105628e70ba857835a8125d8a freebsd-usbin-6.1-r1.ebuild 4558
+RMD160 677988721f65f8f9ae6e163b7bc6570fd5ee45c3 freebsd-usbin-6.1-r1.ebuild 4558
+SHA256 b1902aa6cf644332b3a842f457629c51cb74e4e60d38d6e0e2dd3b6bdddbba4f freebsd-usbin-6.1-r1.ebuild 4558
+MISC ChangeLog 9381 RMD160 e02ec92775ceb08bd9b6be35e0954c9fecc56476 SHA1 df91279f1a326cd5ebac3688c5e49e0b38b78823 SHA256 accd7773edff8266bf474c605848ea854ae178e1f23923a149193571068234bb
+MD5 c671c2e11b813e70834a1a98a9735b9e ChangeLog 9381
+RMD160 e02ec92775ceb08bd9b6be35e0954c9fecc56476 ChangeLog 9381
+SHA256 accd7773edff8266bf474c605848ea854ae178e1f23923a149193571068234bb ChangeLog 9381
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -84,9 +92,9 @@ MD5 1fb7f5f16940cedd1c8fdf66f437a1f4 files/digest-freebsd-usbin-6.1-r1 1804
 RMD160 22ba309f075ae9b8cbae48a54014fe1052ca53a5 files/digest-freebsd-usbin-6.1-r1 1804
 SHA256 0e2af80bb11fda4774c21e3d0e44368ffbce6d71fde45b08d4774a038e4c9f06 files/digest-freebsd-usbin-6.1-r1 1804
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEyBeLAiZjviIA2XgRAnJCAJ4rHg2XLFNjIU/Zkiwf4YXRYyFyOQCg8yY5
-QCeHe49o2lEKghYQU/kwPFw=
-=oTmJ
+iD8DBQFFCYtuAiZjviIA2XgRArZaAJ9gESUHKf5aW7ekXhR1nI3u6s0M2ACfUQAj
+fmH7uX98J3ALk+1Q0QeAwAg=
+=Yh9+
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd
new file mode 100644
index 000000000000..a6d7cd4ef839
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/syscons.confd
@@ -0,0 +1,14 @@
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syscons.confd,v 1.1 2006/09/14 17:03:27 flameeyes Exp $
+# Example syscons config file. This is the place to set things like keymap, etc.
+
+# Set the keymap to "uk.iso".
+#KEYMAP="uk.iso"
+
+# Set the keyboard rate to 250ms delay, and 34 repeat rate.
+#KEYRATE="250.34"
+
+# Change the behaviour of F-unction keys (see kbdcontrol(1)).
+#KEYCHANGE="10 'ssh myhost'"
+
+# See vidcontrol(1) -t
+#BLANKTIME="off"
diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd
new file mode 100755
index 000000000000..2ac87695d263
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/syscons.initd
@@ -0,0 +1,62 @@
+#!/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 $
+
+start() {
+	ebegin "Configuring system console"
+	
+	# XXX: This should handle serial consoles.
+	
+	# Set the keymap.
+	if [ -n "${KEYMAP}" ]; then
+		einfo "Setting keymap to ${KEYMAP}"
+		kbdcontrol -l ${KEYMAP}
+	fi
+	
+	if [ -n "${KEYRATE}" ]; then
+		einfo "Setting keyrate to ${KEYRATE}"
+		kbdcontrol -r ${KEYRATE}
+	fi
+
+	if [ -n "${KEYCHANGE}" ]; then
+		einfo "Changing function keys..."
+		while read $a $b; do
+			kbdcontrol -f "$a" "$b"
+		done <<< ${KEYCHANGE}
+	fi
+	
+	if [ -n "${CURSOR}" ]; then
+		einfo "Setting cursor"
+		vidcontrol -c ${CURSOR}
+	fi
+
+	einfo "Setting custom fonts..."
+	# Nothing to see here, move along...
+	for v in FONT8x{16,14,8}; do
+		if [ -n "${!v}" ]; then
+			vidcontrol -f ${v##FONT} ${!v}
+		fi
+	done
+
+	if [ -n "${BLANKTIME}" ]; then
+		einfo "Setting blanktime"
+		vidcontrol -t ${BLANKTIME}
+	fi
+
+	if [ -n "${SAVER}" ]; then
+		for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do
+			kldunload ${i}
+		done
+		kldstat -v | grep -q _saver || kldload ${SAVER}_saver
+	fi
+
+	if [ -n "${KBDFLAGS}" ]; then
+		einfo "Setting keyboard flags for all screens"
+		for ttyv in /dev/ttyv*; do    
+			kbdcontrol ${KBDFLAGS} <${ttyv} &>${ttyv}
+		done
+	fi
+
+	eend
+}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild
index 01e43b74f1b2..9beedc63542f 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/freebsd-usbin-6.1-r1.ebuild,v 1.1 2006/06/01 11:29:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild,v 1.2 2006/09/14 17:03:27 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -81,6 +81,7 @@ REMOVE_SUBDIRS="
 
 src_unpack() {
 	freebsd_src_unpack
+
 	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
 	ln -s "/usr/include" "${WORKDIR}/include"
 }
@@ -97,7 +98,7 @@ src_install() {
 	# in the wrong place, just put it in the doc directory.
 	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
 
-	for util in nfs nfsmount rpcbind syslogd moused powerd; do
+	for util in nfs nfsmount rpcbind syslogd moused powerd syscons; do
 		newinitd ${FILESDIR}/${util}.initd ${util}
 		[[ -e ${FILESDIR}/${util}.confd ]] && \
 			newconfd ${FILESDIR}/${util}.confd ${util}