clean up import

7 files changed, 45 insertions, 30 deletions

diff --git a/canfield/Makefile b/canfield/Makefile
index 2fff16fc..c656887f 100644
--- a/canfield/Makefile
+++ b/canfield/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.1 (Berkeley) 4/8/91
-#	$Id: Makefile,v 1.2 1993/08/01 05:45:51 mycroft Exp $
+#	$NetBSD: Makefile,v 1.3 1995/03/21 15:08:26 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 SUBDIR= canfield cfscores
 
diff --git a/canfield/canfield/Makefile b/canfield/canfield/Makefile
index aa8e3f13..58772169 100644
--- a/canfield/canfield/Makefile
+++ b/canfield/canfield/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.7 (Berkeley) 4/8/91
-#	$Id: Makefile,v 1.4 1994/12/22 09:33:46 cgd Exp $
+#	$NetBSD: Makefile,v 1.5 1995/03/21 15:08:28 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	canfield
 MAN=	canfield.6
diff --git a/canfield/canfield/canfield.6 b/canfield/canfield/canfield.6
index 663af576..17b34ae3 100644
--- a/canfield/canfield/canfield.6
+++ b/canfield/canfield/canfield.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: canfield.6,v 1.4 1995/03/21 15:08:30 cgd Exp $
+.\"
+.\" Copyright (c) 1983, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)canfield.6	6.5 (Berkeley) 6/23/90
-.\"	$Id: canfield.6,v 1.3 1993/08/05 03:38:03 jtc Exp $
+.\"	@(#)canfield.6	8.1 (Berkeley) 5/31/93
 .\"
-.Dd June 23, 1990
+.Dd May 31, 1993
 .Dt CANFIELD 6
 .Os
 .Sh NAME
diff --git a/canfield/canfield/canfield.c b/canfield/canfield/canfield.c
index e4b14c1d..d9e335b4 100644
--- a/canfield/canfield/canfield.c
+++ b/canfield/canfield/canfield.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: canfield.c,v 1.5 1995/03/21 15:08:32 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,14 +34,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)canfield.c	5.11 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: canfield.c,v 1.4 1995/02/28 18:31:17 jtc Exp $";
+#if 0
+static char sccsid[] = "@(#)canfield.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: canfield.c,v 1.5 1995/03/21 15:08:32 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
@@ -54,10 +59,13 @@ static char rcsid[] = "$Id: canfield.c,v 1.4 1995/02/28 18:31:17 jtc Exp $";
  */
 
 #include <sys/types.h>
-#include <signal.h>
+
 #include <curses.h>
 #include <termios.h>
 #include <ctype.h>
+#include <signal.h>
+#include <termios.h>
+
 #include "pathnames.h"
 
 #define	decksize	52
diff --git a/canfield/canfield/pathnames.h b/canfield/canfield/pathnames.h
index 7ed32dad..4ecb7bb9 100644
--- a/canfield/canfield/pathnames.h
+++ b/canfield/canfield/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1995/03/21 15:08:34 cgd Exp $	*/
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pathnames.h	5.1 (Berkeley) 4/30/90
- *	$Id: pathnames.h,v 1.2 1993/08/01 18:55:30 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  */
 
 #define	_PATH_SCORE	"/var/games/cfscores"
diff --git a/canfield/cfscores/Makefile b/canfield/cfscores/Makefile
index 74ca6cc2..bdc6269f 100644
--- a/canfield/cfscores/Makefile
+++ b/canfield/cfscores/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.2 (Berkeley) 4/8/91
-#	$Id: Makefile,v 1.2 1993/08/01 05:45:46 mycroft Exp $
+#	$NetBSD: Makefile,v 1.3 1995/03/21 15:08:36 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	cfscores
 CFLAGS+=-I${.CURDIR}/../canfield
diff --git a/canfield/cfscores/cfscores.c b/canfield/cfscores/cfscores.c
index da9df376..4a3a0e8f 100644
--- a/canfield/cfscores/cfscores.c
+++ b/canfield/cfscores/cfscores.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: cfscores.c,v 1.3 1995/03/21 15:08:37 cgd Exp $	*/
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,14 +34,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)cfscores.c	5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: cfscores.c,v 1.2 1993/08/01 18:55:25 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)cfscores.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: cfscores.c,v 1.3 1995/03/21 15:08:37 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>