clean up import, NetBSD RCS Ids

30 files changed, 250 insertions, 134 deletions

diff --git a/rogue/CHANGES b/rogue/CHANGES
index 73a71353..679c6384 100644
--- a/rogue/CHANGES
+++ b/rogue/CHANGES
@@ -1,3 +1,5 @@
+$NetBSD: CHANGES,v 1.2 1995/04/22 10:27:22 cgd Exp $
+
 From:    tektronix!zeus.TEK.COM!tims@ucbvax.Berkeley.EDU
 Date:    30 Nov 87 15:08:15 PST (Mon)
 To:      okeeffe.Berkeley.EDU!mckusick@ucbvax.Berkeley.EDU (Kirk McKusick)
diff --git a/rogue/Makefile b/rogue/Makefile
index 4e3f6b4f..75782202 100644
--- a/rogue/Makefile
+++ b/rogue/Makefile
@@ -1,13 +1,13 @@
-#	from: @(#)Makefile	5.7 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.5 1994/12/22 09:36:02 cgd Exp $
+#	$NetBSD: Makefile,v 1.6 1995/04/22 10:27:25 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rogue
 CFLAGS+=-DUNIX -fwritable-strings
 SRCS=	curses.c hit.c init.c inventory.c level.c machdep.c main.c \
 	message.c monster.c move.c object.c pack.c play.c random.c ring.c \
 	room.c save.c score.c spec_hit.c throw.c trap.c use.c zap.c
-DPADD=	${LIBCURSES} ${LIBTERM}
-LDADD=	-lcurses -ltermlib
+DPADD=	${LIBCURSES} ${LIBTERM} ${LIBCOMPAT}
+LDADD=	-lcurses -ltermlib -lcompat
 HIDEGAME=hidegame
 MAN=	rogue.6
 
diff --git a/rogue/USD.doc/Makefile b/rogue/USD.doc/Makefile
index 3df0ddba..359407d9 100644
--- a/rogue/USD.doc/Makefile
+++ b/rogue/USD.doc/Makefile
@@ -1,3 +1,4 @@
+#	$NetBSD: Makefile,v 1.2 1995/04/22 10:28:47 cgd Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 DIR=	usd/30.rogue
diff --git a/rogue/USD.doc/rogue.me b/rogue/USD.doc/rogue.me
index d65f280b..749648de 100644
--- a/rogue/USD.doc/rogue.me
+++ b/rogue/USD.doc/rogue.me
@@ -1,3 +1,5 @@
+.\"	$NetBSD: rogue.me,v 1.2 1995/04/22 10:28:50 cgd Exp $
+.\"
 .\" Copyright (c) 1986, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/rogue/curses.c b/rogue/curses.c
index 33ce4dcc..743e9ee5 100644
--- a/rogue/curses.c
+++ b/rogue/curses.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: curses.c,v 1.3 1995/04/22 10:27:27 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)curses.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: curses.c,v 1.2 1993/08/01 18:52:32 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)curses.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: curses.c,v 1.3 1995/04/22 10:27:27 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/hit.c b/rogue/hit.c
index 205bb89d..cbcd8691 100644
--- a/rogue/hit.c
+++ b/rogue/hit.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: hit.c,v 1.3 1995/04/22 10:27:30 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)hit.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: hit.c,v 1.2 1993/08/01 18:52:31 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)hit.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: hit.c,v 1.3 1995/04/22 10:27:30 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/init.c b/rogue/init.c
index 8144a02e..ac2ec820 100644
--- a/rogue/init.c
+++ b/rogue/init.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: init.c,v 1.3 1995/04/22 10:27:32 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)init.c	5.4 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: init.c,v 1.2 1993/08/01 18:52:30 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: init.c,v 1.3 1995/04/22 10:27:32 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/inventory.c b/rogue/inventory.c
index fa2c2650..c36f9235 100644
--- a/rogue/inventory.c
+++ b/rogue/inventory.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: inventory.c,v 1.3 1995/04/22 10:27:35 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)inventory.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: inventory.c,v 1.2 1993/08/01 18:52:29 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)inventory.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: inventory.c,v 1.3 1995/04/22 10:27:35 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/level.c b/rogue/level.c
index 7ea14855..b298bb04 100644
--- a/rogue/level.c
+++ b/rogue/level.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: level.c,v 1.3 1995/04/22 10:27:37 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)level.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: level.c,v 1.2 1993/08/01 18:52:28 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)level.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: level.c,v 1.3 1995/04/22 10:27:37 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/machdep.c b/rogue/machdep.c
index 640aa8a1..baedb47b 100644
--- a/rogue/machdep.c
+++ b/rogue/machdep.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: machdep.c,v 1.3 1995/04/22 10:27:39 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)machdep.c	5.7 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: machdep.c,v 1.2 1993/08/01 18:52:26 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)machdep.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: machdep.c,v 1.3 1995/04/22 10:27:39 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
@@ -510,38 +515,31 @@ int status;
 /* md_lock():
  *
  * This function is intended to give the user exclusive access to the score
- * file.  It does so by "creat"ing a lock file, which can only be created
- * if it does not already exist.  The file is deleted when score file
- * processing is finished.  The lock file should be located in the same
- * directory as the score file.  These full path names should be defined for
- * any particular site in rogue.h.  The constants _PATH_SCOREFILE and
- * _PATH_LOCKFILE define these file names.
+ * file.  It does so by flock'ing the score file.  The full path name of the
+ * score file should be defined for any particular site in rogue.h.  The
+ * constants _PATH_SCOREFILE defines this file name.
  *
  * When the parameter 'l' is non-zero (true), a lock is requested.  Otherwise
- * the lock is released by removing the lock file.
+ * the lock is released.
  */
 
 md_lock(l)
 boolean l;
 {
+	static int fd;
 	short tries;
-	char *lock_file = _PATH_LOCKFILE;
 
 	if (l) {
-		for (tries = 0; tries < 5; tries++) {
-			if (md_get_file_id(lock_file) == -1) {
-				if (creat(lock_file, 0444) != -1) {
-					break;
-				} else {
-					message("cannot lock score file", 0);
-				}
-			} else {
-				message("waiting to lock score file", 0);
-			}
-			sleep(2);
+		if ((fd = open(_PATH_SCOREFILE, O_RDONLY)) < 1) {
+			message("cannot lock score file", 0);
+			return;
 		}
+		for (tries = 0; tries < 5; tries++)
+			if (!flock(fd, LOCK_EX|LOCK_NB))
+				return;
 	} else {
-		(void) unlink(lock_file);
+		(void)flock(fd, LOCK_NB);
+		(void)close(fd);
 	}
 }
 
diff --git a/rogue/main.c b/rogue/main.c
index febec330..5e472e15 100644
--- a/rogue/main.c
+++ b/rogue/main.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: main.c,v 1.3 1995/04/22 10:27:41 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,14 +37,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1988, 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.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:52:25 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/04/22 10:27:41 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/message.c b/rogue/message.c
index 4e48e18d..3e12c51c 100644
--- a/rogue/message.c
+++ b/rogue/message.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: message.c,v 1.5 1995/04/22 10:27:43 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)message.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: message.c,v 1.4 1993/11/10 10:02:19 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)message.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: message.c,v 1.5 1995/04/22 10:27:43 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/monster.c b/rogue/monster.c
index a81fd311..176ac756 100644
--- a/rogue/monster.c
+++ b/rogue/monster.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: monster.c,v 1.3 1995/04/22 10:27:45 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)monster.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: monster.c,v 1.2 1993/08/01 18:52:23 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)monster.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: monster.c,v 1.3 1995/04/22 10:27:45 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/move.c b/rogue/move.c
index cda2ab19..86e36cf7 100644
--- a/rogue/move.c
+++ b/rogue/move.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: move.c,v 1.3 1995/04/22 10:27:47 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)move.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: move.c,v 1.2 1993/08/01 18:52:22 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: move.c,v 1.3 1995/04/22 10:27:47 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/object.c b/rogue/object.c
index 188987d9..b6f5043a 100644
--- a/rogue/object.c
+++ b/rogue/object.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: object.c,v 1.3 1995/04/22 10:27:50 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)object.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: object.c,v 1.2 1993/08/01 18:52:21 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)object.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: object.c,v 1.3 1995/04/22 10:27:50 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/pack.c b/rogue/pack.c
index 46c580cf..b91bc5a8 100644
--- a/rogue/pack.c
+++ b/rogue/pack.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: pack.c,v 1.3 1995/04/22 10:27:54 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pack.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pack.c,v 1.2 1993/08/01 18:52:20 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pack.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pack.c,v 1.3 1995/04/22 10:27:54 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
@@ -294,6 +299,7 @@ unsigned short mask;
 
 		if (ch == LIST) {
 			check_message();
+			mask = tmask;
 			inventory(&rogue.pack, mask);
 		} else {
 			break;
diff --git a/rogue/pathnames.h b/rogue/pathnames.h
index a6eb48c9..20e5f273 100644
--- a/rogue/pathnames.h
+++ b/rogue/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1995/04/22 10:27: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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,10 +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:52:34 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  */
 
 #define	_PATH_SCOREFILE	"/var/games/rogue.scores"
-#define	_PATH_LOCKFILE	"/var/games/rogue.lock"
-
diff --git a/rogue/play.c b/rogue/play.c
index de89a309..601f8924 100644
--- a/rogue/play.c
+++ b/rogue/play.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: play.c,v 1.3 1995/04/22 10:28:04 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)play.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: play.c,v 1.2 1993/08/01 18:52:19 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: play.c,v 1.3 1995/04/22 10:28:04 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/random.c b/rogue/random.c
index 90e9676c..6e2abc60 100644
--- a/rogue/random.c
+++ b/rogue/random.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: random.c,v 1.3 1995/04/22 10:28:06 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)random.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: random.c,v 1.2 1993/08/01 18:52:18 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)random.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: random.c,v 1.3 1995/04/22 10:28:06 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/ring.c b/rogue/ring.c
index ff5fa8b3..b531fa47 100644
--- a/rogue/ring.c
+++ b/rogue/ring.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: ring.c,v 1.3 1995/04/22 10:28:09 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)ring.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: ring.c,v 1.2 1993/08/01 18:52:17 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)ring.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: ring.c,v 1.3 1995/04/22 10:28:09 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/rogue.6 b/rogue/rogue.6
index 4fd39362..001a8719 100644
--- a/rogue/rogue.6
+++ b/rogue/rogue.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1988 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: rogue.6,v 1.5 1995/04/22 10:28:12 cgd Exp $
+.\"
+.\" Copyright (c) 1988, 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,11 +31,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)rogue.6	6.5 (Berkeley) 6/23/90
-.\"	$Id: rogue.6,v 1.4 1993/08/09 22:20:37 jtc Exp $
+.\"	@(#)rogue.6	8.1 (Berkeley) 5/31/93
 .\"
-.Dd June 23, 1990
+.Dd May 31, 1993
 .Dt ROGUE 6
+.Os
 .Sh NAME
 .Nm rogue
 .Nd Exploring The Dungeons of Doom
diff --git a/rogue/rogue.h b/rogue/rogue.h
index f21ae38d..94e37db9 100644
--- a/rogue/rogue.h
+++ b/rogue/rogue.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: rogue.h,v 1.3 1995/04/22 10:28:14 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timoth C. Stoehr.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)rogue.h	5.6 (Berkeley) 2/28/91
- *	$Id: rogue.h,v 1.2 1993/08/01 18:52:33 mycroft Exp $
+ *	@(#)rogue.h	8.1 (Berkeley) 5/31/93
  */
 
 /*
diff --git a/rogue/room.c b/rogue/room.c
index 33b188cd..88cd0e36 100644
--- a/rogue/room.c
+++ b/rogue/room.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: room.c,v 1.3 1995/04/22 10:28:17 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,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:52:16 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/04/22 10:28:17 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/save.c b/rogue/save.c
index fc794090..135e0db0 100644
--- a/rogue/save.c
+++ b/rogue/save.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: save.c,v 1.3 1995/04/22 10:28:21 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,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:52:14 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/04/22 10:28:21 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/score.c b/rogue/score.c
index 4b4f0691..814c1d39 100644
--- a/rogue/score.c
+++ b/rogue/score.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: score.c,v 1.5 1995/04/22 10:28:26 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)score.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: score.c,v 1.4 1993/11/10 10:02:20 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: score.c,v 1.5 1995/04/22 10:28:26 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/spec_hit.c b/rogue/spec_hit.c
index 1a1cd55b..e4de5a03 100644
--- a/rogue/spec_hit.c
+++ b/rogue/spec_hit.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: spec_hit.c,v 1.3 1995/04/22 10:28:29 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)spec_hit.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: spec_hit.c,v 1.2 1993/08/01 18:52:12 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)spec_hit.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: spec_hit.c,v 1.3 1995/04/22 10:28:29 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/throw.c b/rogue/throw.c
index 6b275877..a5cf0dad 100644
--- a/rogue/throw.c
+++ b/rogue/throw.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: throw.c,v 1.3 1995/04/22 10:28:32 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)throw.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: throw.c,v 1.2 1993/08/01 18:52:11 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)throw.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: throw.c,v 1.3 1995/04/22 10:28:32 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/trap.c b/rogue/trap.c
index 55b23ffb..bd2aff37 100644
--- a/rogue/trap.c
+++ b/rogue/trap.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: trap.c,v 1.3 1995/04/22 10:28:35 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)trap.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: trap.c,v 1.2 1993/08/01 18:52:09 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)trap.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: trap.c,v 1.3 1995/04/22 10:28:35 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/use.c b/rogue/use.c
index cc514940..ebc82b78 100644
--- a/rogue/use.c
+++ b/rogue/use.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: use.c,v 1.3 1995/04/22 10:28:38 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)use.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: use.c,v 1.2 1993/08/01 18:52:08 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)use.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: use.c,v 1.3 1995/04/22 10:28:38 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/rogue/zap.c b/rogue/zap.c
index 7180ce59..401d4493 100644
--- a/rogue/zap.c
+++ b/rogue/zap.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: zap.c,v 1.3 1995/04/22 10:28:41 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Timothy C. Stoehr.
@@ -35,8 +37,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)zap.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: zap.c,v 1.2 1993/08/01 18:52:07 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)zap.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: zap.c,v 1.3 1995/04/22 10:28:41 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*