Upgrade to beta 3.20/b22

5 files changed, 13 insertions, 28 deletions

diff --git a/usr.sbin/pcvt/cursor/cursor.c b/usr.sbin/pcvt/cursor/cursor.c
index f7278f0..683e607 100644
--- a/usr.sbin/pcvt/cursor/cursor.c
+++ b/usr.sbin/pcvt/cursor/cursor.c
@@ -32,7 +32,7 @@
  */
 
 static char *id =
-	"@(#)cursor.c, 3.20, Last Edit-Date: [Mon Dec 19 20:26:38 1994]";
+	"@(#)cursor.c, 3.20, Last Edit-Date: [Thu Feb 23 16:02:33 1995]";
 
 /*---------------------------------------------------------------------------*
  *
diff --git a/usr.sbin/pcvt/fonts/vt220h.808.uu b/usr.sbin/pcvt/fonts/vt220h.808.uu
index 98ae5f3..c9585dc 100644
--- a/usr.sbin/pcvt/fonts/vt220h.808.uu
+++ b/usr.sbin/pcvt/fonts/vt220h.808.uu
@@ -20,8 +20,8 @@ M&!@8&!@,!@P8&!@```X8&!@8&!@8&!@8&`X```!P&!@8&!@8&!@8&!AP```"
 M`@(B$@H&``#NQM;6?```9F8\&'X8`%@D&"0X8`QX`!@`QL9^#'@`P,#XS/C`
 MP%`@4`P\9CP`\&!X;'A@\``.`&9F/!@\````1"@0*$0`_&9F]F9F_`#P$'(6
 M_CINP@``````&`QX&#!@````````````_@```'R"NJJRJH)\`````'@`````
-M``!X"`@``,;&``````````($?AA^($``````````_P```````/\```````#_
-M````````_P```````/\```````#N9F8L&````GS.UN9\@```?-;<T'P``/X`
+M``!X"`@``,;&``````````($?AA^($````````#_````````_P```````/\`
+M``````#_````````_P````````#N9F8L&````GS.UN9\@```?-;<T'P``/X`
 M?,;&?`#^`'@,?,QV`,P`S$AX,'@`.&P`QL;&?``<`,;&QL9\`'``QL;&QGP`
 M`CILUM9LN(``?LS.S,Q^`/XX;,;&;#@`.,8X;,9L.``.`#ALQFPX`'``.&S&
 M;#@`9@`\&!@8/``8)``\&!@\``X`/!@8&#P`<``\&!@8/`#&`/YB>&+^`#A$
diff --git a/usr.sbin/pcvt/fonts/vt220h.814.uu b/usr.sbin/pcvt/fonts/vt220h.814.uu
index 470e887..9d49552 100644
--- a/usr.sbin/pcvt/fonts/vt220h.814.uu
+++ b/usr.sbin/pcvt/fonts/vt220h.814.uu
@@ -36,8 +36,8 @@ M`,#`^,S,^,#`P`````#8<.`P&`P^9F8\``````#P8'AL>&!@8/`````,&`#,
 MS,QX,#`P>`````````!$*!`H1`````````#\9F9F]F9F9OP```#P$'`6_!@P
 M9LZ:/@8&```````````````8#'@`&#!@``````````````````````#^````
 M````````?(*ZJKJRJH)\````````````>````````````````'@("```````
-M`,;&`````````````````````@9^"!!^8$``````````````````_P``````
-M````````_P``````````````_P``````````````_P``````````````_P``
+M`,;&`````````````````````@9^"!!^8$```````````````````/\`````
+M`````````/\``````````````/\``````````````/\``````````````/\`
 M``````````````````#N;F9F;#@````````&?,[>]N9\P```````````?-;6
 MW-!^``````!VW`!\QL;&QGP``````';<`'@,?,S,=@```,S,`,S,2'@P,#!X
 M````.&S&`,;&QL;&QGP````&#!@`QL;&QL;&?````&`P&`#&QL;&QL9\````
diff --git a/usr.sbin/pcvt/ispcvt/ispcvt.c b/usr.sbin/pcvt/ispcvt/ispcvt.c
index dc630f1..26c5e7e 100644
--- a/usr.sbin/pcvt/ispcvt/ispcvt.c
+++ b/usr.sbin/pcvt/ispcvt/ispcvt.c
@@ -31,7 +31,7 @@
  */
 
 static char *id =
-	"@(#)ispcvt.c, 3.20, Last Edit-Date: [Mon Dec 19 14:15:37 1994]";
+	"@(#)ispcvt.c, 3.20, Last Edit-Date: [Sun Feb 19 13:17:57 1995]";
 
 /*---------------------------------------------------------------------------*
  *
@@ -43,7 +43,8 @@ static char *id =
  *	-hm	PCVT_PCBURST
  *	-hm	new ioctl VGAPCVTINFO
  *	-hm	new CONF_ values for 3.10
- *	-hm	new CONF_ values for 3.20 
+ *	-hm	new CONF_ values for 3.20
+ *	-hm	removed PCVT_FAKE_SYSCONS10
  *
  *---------------------------------------------------------------------------*/
 
@@ -225,22 +226,19 @@ char *argv[];
 		fprintf(stderr,"PCVT_USL_VT_COMPAT   = %s\n",
 			(pcvtinfo.compile_opts & CONF_USL_VT_COMPAT) ? "ON" : "OFF");
 	
-		fprintf(stderr,"PCVT_FAKE_SYSCONS10  = %s\t\t",
-			(pcvtinfo.compile_opts & CONF_FAKE_SYSCONS10) ? "ON" : "OFF");
-
-		fprintf(stderr,"PCVT_INHIBIT_NUMLOCK = %s\n",
+		fprintf(stderr,"PCVT_INHIBIT_NUMLOCK = %s\t\t",
 			(pcvtinfo.compile_opts & CONF_INHIBIT_NUMLOCK) ? "ON" : "OFF");
 
-		fprintf(stderr,"PCVT_META_ESC        = %s\t\t",
+		fprintf(stderr,"PCVT_META_ESC        = %s\n",
 			(pcvtinfo.compile_opts & CONF_META_ESC) ? "ON" : "OFF");
 
-		fprintf(stderr,"PCVT_NOFASTSCROLL    = %s\n",
+		fprintf(stderr,"PCVT_NOFASTSCROLL    = %s\t\t",
 			(pcvtinfo.compile_opts & CONF_NOFASTSCROLL) ? "ON" : "OFF");
 
-		fprintf(stderr,"PCVT_SLOW_INTERRUPT  = %s\t\t",
+		fprintf(stderr,"PCVT_SLOW_INTERRUPT  = %s\n",
 			(pcvtinfo.compile_opts & CONF_SLOW_INTERRUPT) ? "ON" : "OFF");
 
-		fprintf(stderr,"PCVT_KBD_FIFO        = %s\n",
+		fprintf(stderr,"PCVT_KBD_FIFO        = %s\t\t",
 			(pcvtinfo.compile_opts & CONF_KBD_FIFO) ? "ON" : "OFF");
 
 		fprintf(stderr,"PCVT_NO_LED_UPDATE   = %s\n\n",
diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile
index 0501b16..3c6f089 100644
--- a/usr.sbin/pcvt/vttest/Makefile
+++ b/usr.sbin/pcvt/vttest/Makefile
@@ -1,19 +1,6 @@
 
-.if !exists(${.CURDIR}/../Makefile.inc)
-error:
-	@echo
-	@echo "                      You MUST link/copy"
-	@echo
-	@echo "       ../Makefile.inc.NetBSD    or   ../Makefile.inc.FreeBSD"
-	@echo
-	@echo "             to ../Makefile.inc before you can proceed !"
-	@echo
-.else
-
 PROG=		vttest
 CFLAGS+=	-traditional -DUSEMYSTTY
 SRCS=		main.c esc.c
 
 .include <bsd.prog.mk>
-
-.endif