From 9e23122a66c9eb552f135f457057a27ae4278ed5 Mon Sep 17 00:00:00 2001
From: Hellmuth Michaelis <hm@FreeBSD.org>
Date: Tue, 28 Mar 2000 09:02:52 +0000
Subject: [PATCH] pcvt cleanup. added $FreeBSD$. get copyright header in sync
 with the FreeBSD recommendation.

---
 usr.sbin/pcvt/scon/Makefile |  2 ++
 usr.sbin/pcvt/scon/scon.1   | 14 +++++---------
 usr.sbin/pcvt/scon/scon.c   | 34 ++++++++--------------------------
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/usr.sbin/pcvt/scon/Makefile b/usr.sbin/pcvt/scon/Makefile
index 6fdb94eb6508..dc7d02a06598 100644
--- a/usr.sbin/pcvt/scon/Makefile
+++ b/usr.sbin/pcvt/scon/Makefile
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
 PROG=	scon
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index d2511dec62ce..cdebf7140257 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -1,4 +1,5 @@
-.\" Copyright (c) 1992,1993,1994 Hellmuth Michaelis and Joerg Wunsch
+.\" Copyright (c) 1992, 2000 Hellmuth Michaelis
+.\" Copyright (c) 1992, 1994 Joerg Wunsch
 .\"
 .\" All rights reserved.
 .\"
@@ -10,12 +11,6 @@
 .\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by
-.\"	Hellmuth Michaelis and Joerg Wunsch
-.\" 4. The name authors may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -28,10 +23,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#)scon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:30:48 1994]
+.\" Last Edit-Date: [Mon Mar 27 17:17:50 2000]
+.\"
 .\" $FreeBSD$
 .\"
-.Dd December 31, 1993
+.Dd March 27, 2000
 .Dt SCON 1
 .Sh NAME
 .Nm scon
diff --git a/usr.sbin/pcvt/scon/scon.c b/usr.sbin/pcvt/scon/scon.c
index d42d5c46e7af..c5acbd9f9185 100644
--- a/usr.sbin/pcvt/scon/scon.c
+++ b/usr.sbin/pcvt/scon/scon.c
@@ -1,5 +1,7 @@
 /*
- * Copyright (c) 1992,1993,1994 Hellmuth Michaelis and Joerg Wunsch
+ * Copyright (c) 1992, 2000 Hellmuth Michaelis
+ *
+ * Copyright (c) 1992, 1994 Joerg Wunsch
  *
  * All rights reserved.
  *
@@ -11,12 +13,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by
- *	Hellmuth Michaelis and Joerg Wunsch
- * 4. The name authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -28,30 +24,16 @@
  * 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.
- *
  */
 
-static char *id =
-	"@(#)scon.c, 3.20, Last Edit-Date: [Sun Sep 25 12:33:21 1994]";
-
 /*---------------------------------------------------------------------------*
  *
- *	history:
+ *	scon - screen control utility for pcvt
+ *	--------------------------------------
  *
- *	-hm	moving fd for default device from 1 -> 0 for such things
- *		as "scon -p list | more" to be possible
- *		(reported by Gordon L. Burditt, gordon@sneaky.lonestar.org)
- *	-hm	adding option "a" for just returning the type of video adaptor
- *	-hm	removing explicit HGC support, same as MDA ...
- *	-hm	vga type/family/132col support info on -l
- *	-hm	force 24 lines in DEC 25 lines mode and HP 28 lines mode
- *	-hm	fixed bug with 132 column mode display status display
- *	-jw	added 132/80 col mode switching
- *	-hm	removed -h flag, use -? now ... ;-)
- *	-hm	S3 chipsets ..
- *	-hm	Cirrus chipsets support from Onno van der Linden
- *	-hm	-m option, display monitor type
- *	-hm	bugfix, scon -c <screen-num> cleared dest screen, fixed
+ *	Last Edit-Date: [Mon Mar 27 17:19:34 2000]
+ *
+ * $FreeBSD$
  *
  *---------------------------------------------------------------------------*/