clean up import

26 files changed, 219 insertions, 107 deletions

diff --git a/battlestar/Makefile b/battlestar/Makefile
index cae67db4..f187de46 100644
--- a/battlestar/Makefile
+++ b/battlestar/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.5 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.4 1994/12/22 09:33:04 cgd Exp $
+#	$NetBSD: Makefile,v 1.5 1995/03/21 15:06:38 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	battlestar
 SRCS=	battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
diff --git a/battlestar/battlestar.6 b/battlestar/battlestar.6
index 4dc50b09..a6dda29e 100644
--- a/battlestar/battlestar.6
+++ b/battlestar/battlestar.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1983 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: battlestar.6,v 1.4 1995/03/21 15:06:42 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: @(#)battlestar.6	1.4 (Berkeley) 6/23/90
-.\"	$Id: battlestar.6,v 1.3 1993/08/05 16:40:44 jtc Exp $
+.\"	@(#)battlestar.6	8.1 (Berkeley) 5/31/93
 .\"
-.Dd June 23, 1990
+.Dd May 31, 1993
 .Dt BATTLESTAR 6
 .Os
 .Sh NAME
diff --git a/battlestar/battlestar.c b/battlestar/battlestar.c
index 7f4cfe92..078adb98 100644
--- a/battlestar/battlestar.c
+++ b/battlestar/battlestar.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 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: @(#)battlestar.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: battlestar.c,v 1.2 1993/08/01 18:56:14 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)battlestar.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/battlestar/com1.c b/battlestar/com1.c
index f1ac5f6b..136e3aa7 100644
--- a/battlestar/com1.c
+++ b/battlestar/com1.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: com1.c,v 1.3 1995/03/21 15:06:51 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)com1.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: com1.c,v 1.2 1993/08/01 18:56:13 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)com1.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: com1.c,v 1.3 1995/03/21 15:06:51 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/com2.c b/battlestar/com2.c
index 051eb72c..69a4ca14 100644
--- a/battlestar/com2.c
+++ b/battlestar/com2.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: com2.c,v 1.3 1995/03/21 15:06:55 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)com2.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: com2.c,v 1.2 1993/08/01 18:56:12 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)com2.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: com2.c,v 1.3 1995/03/21 15:06:55 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/com3.c b/battlestar/com3.c
index 1e24684b..1bb1889d 100644
--- a/battlestar/com3.c
+++ b/battlestar/com3.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: com3.c,v 1.3 1995/03/21 15:07:00 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)com3.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: com3.c,v 1.2 1993/08/01 18:56:09 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)com3.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: com3.c,v 1.3 1995/03/21 15:07:00 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/com4.c b/battlestar/com4.c
index 3034fd75..93e17fff 100644
--- a/battlestar/com4.c
+++ b/battlestar/com4.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: com4.c,v 1.3 1995/03/21 15:07:04 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)com4.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: com4.c,v 1.2 1993/08/01 18:56:11 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)com4.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: com4.c,v 1.3 1995/03/21 15:07:04 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/com5.c b/battlestar/com5.c
index 5b1f143a..205bd1ad 100644
--- a/battlestar/com5.c
+++ b/battlestar/com5.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: com5.c,v 1.3 1995/03/21 15:07:07 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)com5.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: com5.c,v 1.2 1993/08/01 18:56:08 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)com5.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: com5.c,v 1.3 1995/03/21 15:07:07 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/com6.c b/battlestar/com6.c
index ddf30d2a..b1f48290 100644
--- a/battlestar/com6.c
+++ b/battlestar/com6.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: com6.c,v 1.3 1995/03/21 15:07:09 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)com6.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: com6.c,v 1.2 1993/08/01 18:56:07 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)com6.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: com6.c,v 1.3 1995/03/21 15:07:09 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/com7.c b/battlestar/com7.c
index 0ff9cb53..abe88577 100644
--- a/battlestar/com7.c
+++ b/battlestar/com7.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: com7.c,v 1.3 1995/03/21 15:07:12 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)com7.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: com7.c,v 1.2 1993/08/01 18:56:06 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)com7.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: com7.c,v 1.3 1995/03/21 15:07:12 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/cypher.c b/battlestar/cypher.c
index 238bf49e..8d5d3f30 100644
--- a/battlestar/cypher.c
+++ b/battlestar/cypher.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: cypher.c,v 1.3 1995/03/21 15:07:15 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)cypher.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: cypher.c,v 1.2 1993/08/01 18:56:03 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)cypher.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: cypher.c,v 1.3 1995/03/21 15:07:15 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/dayfile.c b/battlestar/dayfile.c
index 0d368548..ed511fae 100644
--- a/battlestar/dayfile.c
+++ b/battlestar/dayfile.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dayfile.c,v 1.3 1995/03/21 15:07:18 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dayfile.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dayfile.c,v 1.2 1993/08/01 18:56:04 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dayfile.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dayfile.c,v 1.3 1995/03/21 15:07:18 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/dayobjs.c b/battlestar/dayobjs.c
index cdf16d16..819ffb96 100644
--- a/battlestar/dayobjs.c
+++ b/battlestar/dayobjs.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: dayobjs.c,v 1.3 1995/03/21 15:07:22 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dayobjs.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dayobjs.c,v 1.2 1993/08/01 18:56:02 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dayobjs.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dayobjs.c,v 1.3 1995/03/21 15:07:22 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/externs.h b/battlestar/externs.h
index 38ea5771..2af7978b 100644
--- a/battlestar/externs.h
+++ b/battlestar/externs.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: externs.h,v 1.4 1995/03/21 15:07:25 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
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)externs.h	5.4 (Berkeley) 6/1/90
- *	$Id: externs.h,v 1.3 1995/02/28 18:31:09 jtc Exp $
+ *	@(#)externs.h	8.1 (Berkeley) 5/31/93
  */
 
 #include <signal.h>
diff --git a/battlestar/fly.c b/battlestar/fly.c
index 663cf739..b98364e9 100644
--- a/battlestar/fly.c
+++ b/battlestar/fly.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: fly.c,v 1.3 1995/03/21 15:07:28 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)fly.c	5.6 (Berkeley) 3/4/91";*/
-static char rcsid[] = "$Id: fly.c,v 1.2 1993/08/01 18:56:01 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)fly.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: fly.c,v 1.3 1995/03/21 15:07:28 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
@@ -69,7 +74,6 @@ visual()
 	void moveenemy();
 
 	destroyed = 0;
-	savetty();
 	if(initscr() == ERR){
 		puts("Whoops!  No more memory...");
 		return(0);
diff --git a/battlestar/getcom.c b/battlestar/getcom.c
index 6674304a..d6726de0 100644
--- a/battlestar/getcom.c
+++ b/battlestar/getcom.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: getcom.c,v 1.3 1995/03/21 15:07:30 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)getcom.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: getcom.c,v 1.2 1993/08/01 18:56:00 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)getcom.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: getcom.c,v 1.3 1995/03/21 15:07:30 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/battlestar/globals.c b/battlestar/globals.c
index 485be664..66f5af63 100644
--- a/battlestar/globals.c
+++ b/battlestar/globals.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: globals.c,v 1.3 1995/03/21 15:07:32 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)globals.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: globals.c,v 1.2 1993/08/01 18:55:58 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)globals.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: globals.c,v 1.3 1995/03/21 15:07:32 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/init.c b/battlestar/init.c
index 6a6a6b5b..2a798ee1 100644
--- a/battlestar/init.c
+++ b/battlestar/init.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: init.c,v 1.4 1995/03/21 15:07:35 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)init.c	5.5 (Berkeley) 2/27/91";*/
-static char rcsid[] = "$Id: init.c,v 1.3 1993/08/01 18:55:59 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: init.c,v 1.4 1995/03/21 15:07:35 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/battlestar/misc.c b/battlestar/misc.c
index b37c1259..590760bf 100644
--- a/battlestar/misc.c
+++ b/battlestar/misc.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: misc.c,v 1.3 1995/03/21 15:07: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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: misc.c,v 1.2 1993/08/01 18:55:58 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: misc.c,v 1.3 1995/03/21 15:07:37 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/nightfile.c b/battlestar/nightfile.c
index b446e655..91c901ff 100644
--- a/battlestar/nightfile.c
+++ b/battlestar/nightfile.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: nightfile.c,v 1.3 1995/03/21 15:07:41 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)nightfile.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: nightfile.c,v 1.2 1993/08/01 18:55:56 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)nightfile.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: nightfile.c,v 1.3 1995/03/21 15:07:41 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/nightobjs.c b/battlestar/nightobjs.c
index 5cc08730..e3efd2d9 100644
--- a/battlestar/nightobjs.c
+++ b/battlestar/nightobjs.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: nightobjs.c,v 1.3 1995/03/21 15:07:46 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)nightobjs.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: nightobjs.c,v 1.2 1993/08/01 18:55:55 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)nightobjs.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: nightobjs.c,v 1.3 1995/03/21 15:07:46 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/parse.c b/battlestar/parse.c
index 4a4919b7..27add0c7 100644
--- a/battlestar/parse.c
+++ b/battlestar/parse.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: parse.c,v 1.3 1995/03/21 15:07:48 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)parse.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: parse.c,v 1.2 1993/08/01 18:55:53 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: parse.c,v 1.3 1995/03/21 15:07:48 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/pathnames.h b/battlestar/pathnames.h
index 141dc7df..26413952 100644
--- a/battlestar/pathnames.h
+++ b/battlestar/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1995/03/21 15:07:51 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) 6/1/90
- *	$Id: pathnames.h,v 1.2 1993/08/01 18:56:14 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  */
 
 #define	_PATH_SCORE	"/var/games/battlestar.log"
diff --git a/battlestar/room.c b/battlestar/room.c
index 3ff7d586..631baf9d 100644
--- a/battlestar/room.c
+++ b/battlestar/room.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: room.c,v 1.3 1995/03/21 15:07:54 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)room.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: room.c,v 1.2 1993/08/01 18:55:54 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)room.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: room.c,v 1.3 1995/03/21 15:07:54 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/save.c b/battlestar/save.c
index f8faf513..85c85951 100644
--- a/battlestar/save.c
+++ b/battlestar/save.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: save.c,v 1.3 1995/03/21 15:07:57 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)save.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: save.c,v 1.2 1993/08/01 18:55:52 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: save.c,v 1.3 1995/03/21 15:07:57 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/battlestar/words.c b/battlestar/words.c
index 0f4c3d93..64dac12a 100644
--- a/battlestar/words.c
+++ b/battlestar/words.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: words.c,v 1.3 1995/03/21 15:08:00 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)words.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: words.c,v 1.2 1993/08/01 18:55:50 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)words.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: words.c,v 1.3 1995/03/21 15:08:00 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"