clean up import

18 files changed, 132 insertions, 75 deletions

diff --git a/atc/Makefile b/atc/Makefile
index 22ade6bc..8bf902a6 100644
--- a/atc/Makefile
+++ b/atc/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.7 (Berkeley) 6/27/90
-#	$Id: Makefile,v 1.8 1994/12/25 12:38:41 pk Exp $
+#	$NetBSD: Makefile,v 1.9 1995/03/21 15:03:38 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	atc
 CFLAGS+=-DBSD -I${.CURDIR} -I.
diff --git a/atc/atc.6 b/atc/atc.6
index 9c1a21b1..b7e32d69 100644
--- a/atc/atc.6
+++ b/atc/atc.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: atc.6,v 1.3 1995/03/21 15:03:43 cgd Exp $
+.\"
+.\" Copyright (c) 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Ed James.
@@ -32,8 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)atc.6	5.4 (Berkeley) 6/23/90
-.\"	$Id: atc.6,v 1.2 1993/08/01 07:47:39 mycroft Exp $
+.\"	@(#)atc.6	8.1 (Berkeley) 5/31/93
 .\"
 .       \" XP - exdented paragraph
 .de XP
@@ -46,10 +47,10 @@
 ..
 .\" Copyright (c) 1986 Ed James. All rights reserved. 
 .\"
-.TH ATC 6 "June 23, 1990"
+.TH ATC 6 "May 31, 1993"
 .UC
 .SH NAME
-atc \- Air Traffic Controller Game
+atc \- air traffic controller game
 .SH SYNOPSIS
 .B atc
 -[u?lstp] [-[gf] game_name] [-r random seed]
diff --git a/atc/def.h b/atc/def.h
index eb3dae10..1290a30e 100644
--- a/atc/def.h
+++ b/atc/def.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: def.h,v 1.3 1995/03/21 15:03:47 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)def.h	5.2 (Berkeley) 4/30/90
- *	$Id: def.h,v 1.2 1993/08/01 18:57:17 mycroft Exp $
+ *	@(#)def.h	8.1 (Berkeley) 5/31/93
  */
 
 /*
diff --git a/atc/extern.c b/atc/extern.c
index 2d89f58c..2f9a2128 100644
--- a/atc/extern.c
+++ b/atc/extern.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: extern.c,v 1.3 1995/03/21 15:03:50 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,8 +46,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)extern.c	5.4 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$Id: extern.c,v 1.2 1993/08/01 18:57:11 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: extern.c,v 1.3 1995/03/21 15:03:50 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "include.h"
diff --git a/atc/extern.h b/atc/extern.h
index 5d5f632c..fac22924 100644
--- a/atc/extern.h
+++ b/atc/extern.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: extern.h,v 1.3 1995/03/21 15:03:54 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)extern.h	5.4 (Berkeley) 10/30/90
- *	$Id: extern.h,v 1.2 1993/08/01 18:57:16 mycroft Exp $
+ *	@(#)extern.h	8.1 (Berkeley) 5/31/93
  */
 
 /*
diff --git a/atc/grammar.y b/atc/grammar.y
index d4a31d33..a409b490 100644
--- a/atc/grammar.y
+++ b/atc/grammar.y
@@ -1,6 +1,8 @@
+/*	$NetBSD: grammar.y,v 1.3 1995/03/21 15:03:59 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -62,8 +64,11 @@
 #include "include.h"
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)grammar.y	5.2 (Berkeley) 4/30/90";*/
-static char rcsid[] = "$Id: grammar.y,v 1.2 1993/08/01 18:57:12 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)grammar.y	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: grammar.y,v 1.3 1995/03/21 15:03:59 cgd Exp $";
+#endif
 #endif /* not lint */
 
 int	errors = 0;
diff --git a/atc/graphics.c b/atc/graphics.c
index 6565e85c..75df3925 100644
--- a/atc/graphics.c
+++ b/atc/graphics.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: graphics.c,v 1.3 1995/03/21 15:04:04 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,8 +46,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)graphics.c	5.3 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$Id: graphics.c,v 1.2 1993/08/01 18:57:09 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)graphics.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: graphics.c,v 1.3 1995/03/21 15:04:04 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "include.h"
diff --git a/atc/include.h b/atc/include.h
index a8cbfb18..2e8865a7 100644
--- a/atc/include.h
+++ b/atc/include.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: include.h,v 1.3 1995/03/21 15:04:08 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)include.h	5.3 (Berkeley) 4/30/90
- *	$Id: include.h,v 1.2 1993/08/01 18:57:16 mycroft Exp $
+ *	@(#)include.h	8.1 (Berkeley) 5/31/93
  */
 
 /*
diff --git a/atc/input.c b/atc/input.c
index f4a9ee07..fa2d58e9 100644
--- a/atc/input.c
+++ b/atc/input.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: input.c,v 1.3 1995/03/21 15:04:12 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,8 +46,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)input.c	5.4 (Berkeley) 4/30/90";*/
-static char rcsid[] = "$Id: input.c,v 1.2 1993/08/01 18:57:08 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: input.c,v 1.3 1995/03/21 15:04:12 cgd Exp $";
+#endif
 #endif not lint
 
 #include "include.h"
diff --git a/atc/lex.l b/atc/lex.l
index 325b3e68..54f84c46 100644
--- a/atc/lex.l
+++ b/atc/lex.l
@@ -1,7 +1,9 @@
 %{
+/*	$NetBSD: lex.l,v 1.3 1995/03/21 15:04:15 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -45,8 +47,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)lex.l	5.2 (Berkeley) 4/30/90";*/
-static char rcsid[] = "$Id: lex.l,v 1.2 1993/08/01 18:57:07 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)lex.l	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: lex.l,v 1.3 1995/03/21 15:04:15 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "y.tab.h"
diff --git a/atc/list.c b/atc/list.c
index 8827bade..62132cb9 100644
--- a/atc/list.c
+++ b/atc/list.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: list.c,v 1.3 1995/03/21 15:04:18 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,8 +46,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)list.c	5.2 (Berkeley) 4/30/90";*/
-static char rcsid[] = "$Id: list.c,v 1.2 1993/08/01 18:57:05 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)list.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: list.c,v 1.3 1995/03/21 15:04:18 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "include.h"
diff --git a/atc/log.c b/atc/log.c
index e9ea4309..76e878d8 100644
--- a/atc/log.c
+++ b/atc/log.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: log.c,v 1.3 1995/03/21 15:04:21 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,8 +46,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)log.c	5.7 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$Id: log.c,v 1.2 1993/08/01 18:57:06 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: log.c,v 1.3 1995/03/21 15:04:21 cgd Exp $";
+#endif
 #endif not lint
 
 #include "include.h"
diff --git a/atc/main.c b/atc/main.c
index 0910da90..a75a43f2 100644
--- a/atc/main.c
+++ b/atc/main.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: main.c,v 1.3 1995/03/21 15:04:24 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,14 +46,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1990, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)main.c	5.4 (Berkeley) 3/5/91";*/
-static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:57:04 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/03/21 15:04:24 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "include.h"
diff --git a/atc/pathnames.h b/atc/pathnames.h
index 796e5c78..c6f65339 100644
--- a/atc/pathnames.h
+++ b/atc/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1995/03/21 15:04:28 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.4 (Berkeley) 4/30/90
- *	$Id: pathnames.h,v 1.2 1993/08/01 18:57:15 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  */
 
 #include <paths.h>
diff --git a/atc/struct.h b/atc/struct.h
index 2cde703c..016f1d6c 100644
--- a/atc/struct.h
+++ b/atc/struct.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: struct.h,v 1.3 1995/03/21 15:04:31 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)struct.h	5.2 (Berkeley) 4/30/90
- *	$Id: struct.h,v 1.2 1993/08/01 18:57:14 mycroft Exp $
+ *	@(#)struct.h	8.1 (Berkeley) 5/31/93
  */
 
 /*
diff --git a/atc/tunable.c b/atc/tunable.c
index d2eb3e2d..b864e70d 100644
--- a/atc/tunable.c
+++ b/atc/tunable.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: tunable.c,v 1.3 1995/03/21 15:04:33 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,8 +46,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)tunable.c	5.4 (Berkeley) 4/30/90";*/
-static char rcsid[] = "$Id: tunable.c,v 1.2 1993/08/01 18:57:03 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)tunable.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: tunable.c,v 1.3 1995/03/21 15:04:33 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/atc/tunable.h b/atc/tunable.h
index 44e43855..a295a477 100644
--- a/atc/tunable.h
+++ b/atc/tunable.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: tunable.h,v 1.3 1995/03/21 15:04:35 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)tunable.h	5.3 (Berkeley) 4/30/90
- *	$Id: tunable.h,v 1.2 1993/08/01 18:57:13 mycroft Exp $
+ *	@(#)tunable.h	8.1 (Berkeley) 5/31/93
  */
 
 /*
diff --git a/atc/update.c b/atc/update.c
index b5feab5f..cc2f85c5 100644
--- a/atc/update.c
+++ b/atc/update.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: update.c,v 1.3 1995/03/21 15:04:37 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.
  *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
@@ -44,8 +46,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)update.c	5.5 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$Id: update.c,v 1.2 1993/08/01 18:57:02 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)update.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: update.c,v 1.3 1995/03/21 15:04:37 cgd Exp $";
+#endif
 #endif not lint
 
 #include "include.h"