Send the pcvt(4) driver off to retirement.

6 files changed, 1 insertions, 275 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 970ac9a..5930bb2 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -426,25 +426,6 @@ mousechar_start="NO"	# if 0xd0-0xd3 default range is occupied in your
 allscreens_flags=""	# Set this vidcontrol mode for all virtual screens
 allscreens_kbdflags=""	# Set this kbdcontrol mode for all virtual screens
 
-
-##############################################################
-###  pcvt console driver options  ############################
-##############################################################
-
-pcvt_verbose="NO"	# set to YES to enable verbose configuration messages
-pcvt_keymap="NO"	# keyboard map in /usr/share/misc/keycap.pcvt (or NO).
-pcvt_keydel="NO"	# key repeat delay, 0-3 (250,500,750,1000 msec) (or NO).
-pcvt_keyrate="NO"	# keyboard repetition rate 31-0 (2-30 char/sec) (or NO).
-pcvt_keyrepeat="NO"	# keyboard repeat ON or OFF (or NO).
-pcvt_force24="NO"	# force a 24 line display (when 25 possible) (or NO).
-pcvt_hpext="NO"		# use HP extensions (function keys labels) (or NO).
-pcvt_lines="NO"		# lines (25, 28, 40, 50 or NO).
-pcvt_blanktime="NO"	# blank time (in seconds) (or NO).
-pcvt_cursorh="NO"	# cursor top scanline (topmost line is 0) (or NO).
-pcvt_cursorl="NO"	# cursor low scanline (bottom line is 16) (or NO).
-pcvt_monohigh="NO"	# set intensity to high on monochrome monitors (or NO).
-
-
 ##############################################################
 ###  Mail Transfer Agent (MTA) options  ######################
 ##############################################################
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 59e2a72..0bec750 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -799,8 +799,6 @@
         misc
             fonts
             ..
-            pcvtfonts
-            ..
         ..
         mk
         ..
@@ -1126,12 +1124,6 @@
                 ..
             ..
         ..
-        pcvt
-            Doc
-            ..
-            Etc
-            ..
-        ..
         security
         ..
         sendmail
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 45ffa4a..e471893 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -27,7 +27,7 @@ FILES=	DAEMON LOGIN NETWORKING SERVERS \
 	network_ipv6 newsyslog nfsclient nfsd \
 	nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
 	othermta \
-	pcvt pf pflog pfsync \
+	pf pflog pfsync \
 	powerd power_profile ppp pppoed pwcheck \
 	quota \
 	ramdisk ramdisk-own random rarpd resolv root \
diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd
index 7ed1628..71aae18 100644
--- a/etc/rc.d/isdnd
+++ b/etc/rc.d/isdnd
@@ -21,16 +21,6 @@ isdnd_start()
 {
 	echo -n 'ISDN subsystem setup:'
 
-	# Check for pcvt driver (VT100/VT220 emulator)
-	#
-	if [ -x /usr/sbin/ispcvt ]; then
-		if /usr/sbin/ispcvt; then
-			# No vidcontrol if we are using pcvt
-			#
-			isdn_screenflags=NO
-		fi
-	fi
-
 	# Start isdnd
 	#
 	echo -n ' isdnd'
diff --git a/etc/rc.d/pcvt b/etc/rc.d/pcvt
deleted file mode 100644
index dd84b0f..0000000
--- a/etc/rc.d/pcvt
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/sh -
-#
-# Copyright (c) 2002  The FreeBSD Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: pcvt
-# REQUIRE: LOGIN
-# KEYWORD: nojail
-
-. /etc/rc.subr
-
-name="pcvt"
-start_precmd="pcvt_precmd"
-start_cmd="pcvt_start"
-
-pcvt_precmd()
-{
-	if [ -x /usr/sbin/ispcvt ]; then
-		/usr/sbin/ispcvt -d /dev/ttyv0 && return 0
-	fi
-	return 1
-}
-
-pcvt_echo()
-{
-	if checkyesno pcvt_verbose; then
-		echo $1 "$2"
-	fi
-}
-
-pcvt_start()
-{
-	# path for pcvt's EGA/VGA download fonts
-	FONTP=/usr/share/misc/pcvtfonts
-
-	if checkyesno pcvt_verbose; then
-		echo "Configuring pcvt console driver:"
-	else
-		echo "-n" "Configuring pcvt"
-	fi
-
-	# video adapter type
-
-	adapter=`/usr/sbin/scon -d /dev/ttyv0 -a`
-
-	pcvt_echo "-n" "  video adapter type is $adapter, "
-
-	# monitor type (mono/color)
-
-	monitor=`/usr/sbin/scon -d /dev/ttyv0 -m`
-
-	pcvt_echo "" "monitor type is $monitor"
-
-	# load fonts into VGA
-
-	if [ $adapter = VGA ]; then
-		pcvt_echo "-n" "  loading fonts: 8x16:0,"
-		loadfont -d /dev/ttyv0 -c0 -f $FONTP/vt220l.816
-
-		pcvt_echo "-n" "1 "
-		loadfont -d /dev/ttyv0 -c1 -f $FONTP/vt220h.816
-
-		pcvt_echo "-n" " 8x14:0,"
-		loadfont -d /dev/ttyv0 -c2 -f $FONTP/vt220l.814
-
-		pcvt_echo "-n" "1 "
-		loadfont -d /dev/ttyv0 -c3 -f $FONTP/vt220h.814
-
-		pcvt_echo "-n" " 8x10:0,"
-		loadfont -d /dev/ttyv0 -c4 -f $FONTP/vt220l.810
-
-		pcvt_echo "-n" "1 "
-		loadfont -d /dev/ttyv0 -c5 -f $FONTP/vt220h.810
-
-		pcvt_echo "-n" " 8x8:0,"
-		loadfont -d /dev/ttyv0 -c6 -f $FONTP/vt220l.808
-
-		pcvt_echo "" "1 "
-		loadfont -d /dev/ttyv0 -c7 -f $FONTP/vt220h.808
-
-	# setting screen sizes
-
-		case ${pcvt_lines} in
-		28)
-			size=-s28
-			pcvt_echo "" "  switching to 28 lines"
-			;;
-		40)
-			size=-s40
-			pcvt_echo "" "  switching to 40 lines"
-			;;
-		50)
-			size=-s50
-			pcvt_echo "" "  switching to 50 lines"
-			;;
-		*)
-			size=-s25
-			pcvt_echo "" "  switching to 25 lines"
-			;;
-		esac
-	fi
-
-	# use HP extensions to VT220 or plain VT220 ?
-
-	if checkyesno pcvt_hpext; then
-		emulation=-H
-		pcvt_echo "" "  setting emulation to VT220 with HP extensions"
-	else
-		emulation=-V
-		pcvt_echo "" "  setting emulation to VT220"
-	fi
-
-	# for all screens do
-
-	for device in /dev/ttyv*
-	do
-		# set emulation
-
-		/usr/sbin/scon -d$device $size $emulation >/dev/null 2>&1
-		if [ $? != 0 ]; then
-			break 1
-		fi
-
-		# set cursor shape
-
-		case ${pcvt_cursorh} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			case ${pcvt_cursorl} in
-			[Nn][Oo] | '')
-				;;
-			*)
-				/usr/sbin/cursor -d$device -s$pcvt_cursorh -e$pcvt_cursorl
-				;;
-			esac
-			;;
-		esac
-
-		# on monochrome monitor, set color palette to use a higher intensity
-
-		if checkyesno pcvt_monohigh && \
-			[ $monitor = MONO -a $adapter = VGA ]
-		then
-			/usr/sbin/scon -d$device -p8,60,60,60
-		fi
-	done
-
-	# switch to screen 0
-
-	pcvt_echo "" "  switching to screen 0"
-
-	/usr/sbin/scon -d /dev/ttyv0
-
-	# screensaver timeout
-
-	case ${pcvt_blanktime} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  setting screensaver timeout to $pcvt_blanktime seconds"
-		/usr/sbin/scon -d /dev/ttyv0 -t$pcvt_blanktime
-		;;
-	esac
-
-	# national keyboard layout
-
-	case ${pcvt_keymap} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  switching national keyboard layout to $pcvt_keymap"
-		/usr/sbin/kcon -m $pcvt_keymap
-		;;
-	esac
-
-	# keyboard repeat delay value
-
-	case ${pcvt_keydel} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  setting keyboard delay to $pcvt_keydel"
-		/usr/sbin/kcon -d$pcvt_keydel
-		;;
-	esac
-
-	# keyboard repeat rate value
-
-	case ${pcvt_keyrate} in
-	[Nn][Oo] | '')
-		;;
-	*)
-		pcvt_echo "" "  setting keyboard repeat rate to $pcvt_keyrate"
-		/usr/sbin/kcon -r$pcvt_keyrate
-		;;
-	esac
-
-	# done
-
-	if checkyesno pcvt_verbose; then
-		echo "Finished configuring pcvt console driver."
-	else
-		echo "."
-	fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons
index f4eccf7c..e573dec 100644
--- a/etc/rc.d/syscons
+++ b/etc/rc.d/syscons
@@ -127,10 +127,6 @@ syscons_precmd()
 	then
 		return 1
 	fi
-	if [ -x /usr/sbin/ispcvt ] && /usr/sbin/ispcvt
-	then
-		return 1
-	fi
 	return 0
 }