From 7ee35daafdaf9901fe48d8fe2ca3f387cead3f25 Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Sat, 22 Apr 1995 10:27:22 +0000
Subject: [PATCH] clean up import, NetBSD RCS Ids

---
 games/rogue/CHANGES          |  2 ++
 games/rogue/Makefile         |  8 +++----
 games/rogue/USD.doc/Makefile |  1 +
 games/rogue/USD.doc/rogue.me |  2 ++
 games/rogue/curses.c         | 13 ++++++----
 games/rogue/hit.c            | 13 ++++++----
 games/rogue/init.c           | 13 ++++++----
 games/rogue/inventory.c      | 13 ++++++----
 games/rogue/level.c          | 13 ++++++----
 games/rogue/machdep.c        | 46 +++++++++++++++++-------------------
 games/rogue/main.c           | 19 +++++++++------
 games/rogue/message.c        | 13 ++++++----
 games/rogue/monster.c        | 13 ++++++----
 games/rogue/move.c           | 13 ++++++----
 games/rogue/object.c         | 13 ++++++----
 games/rogue/pack.c           | 14 +++++++----
 games/rogue/pathnames.h      | 11 ++++-----
 games/rogue/play.c           | 13 ++++++----
 games/rogue/random.c         | 13 ++++++----
 games/rogue/ring.c           | 13 ++++++----
 games/rogue/rogue.6          | 12 ++++++----
 games/rogue/rogue.h          |  9 +++----
 games/rogue/room.c           | 13 ++++++----
 games/rogue/save.c           | 13 ++++++----
 games/rogue/score.c          | 13 ++++++----
 games/rogue/spec_hit.c       | 13 ++++++----
 games/rogue/throw.c          | 13 ++++++----
 games/rogue/trap.c           | 13 ++++++----
 games/rogue/use.c            | 13 ++++++----
 games/rogue/zap.c            | 13 ++++++----
 30 files changed, 250 insertions(+), 134 deletions(-)

diff --git a/games/rogue/CHANGES b/games/rogue/CHANGES
index 73a713538271..679c6384c8f0 100644
--- a/games/rogue/CHANGES
+++ b/games/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/games/rogue/Makefile b/games/rogue/Makefile
index 4e3f6b4fcb83..75782202c03a 100644
--- a/games/rogue/Makefile
+++ b/games/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/games/rogue/USD.doc/Makefile b/games/rogue/USD.doc/Makefile
index 3df0ddba2c1b..359407d9e295 100644
--- a/games/rogue/USD.doc/Makefile
+++ b/games/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/games/rogue/USD.doc/rogue.me b/games/rogue/USD.doc/rogue.me
index d65f280b49e9..749648dee879 100644
--- a/games/rogue/USD.doc/rogue.me
+++ b/games/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/games/rogue/curses.c b/games/rogue/curses.c
index 33ce4dcc5587..743e9ee53fb9 100644
--- a/games/rogue/curses.c
+++ b/games/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/games/rogue/hit.c b/games/rogue/hit.c
index 205bb89d41ae..cbcd869124ce 100644
--- a/games/rogue/hit.c
+++ b/games/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/games/rogue/init.c b/games/rogue/init.c
index 8144a02e6c8a..ac2ec8208b83 100644
--- a/games/rogue/init.c
+++ b/games/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/games/rogue/inventory.c b/games/rogue/inventory.c
index fa2c26507da2..c36f923542d2 100644
--- a/games/rogue/inventory.c
+++ b/games/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/games/rogue/level.c b/games/rogue/level.c
index 7ea14855e936..b298bb044a19 100644
--- a/games/rogue/level.c
+++ b/games/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/games/rogue/machdep.c b/games/rogue/machdep.c
index 640aa8a1621a..baedb47bed77 100644
--- a/games/rogue/machdep.c
+++ b/games/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/games/rogue/main.c b/games/rogue/main.c
index febec33083ca..5e472e15ac01 100644
--- a/games/rogue/main.c
+++ b/games/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/games/rogue/message.c b/games/rogue/message.c
index 4e48e18d71fa..3e12c51c9f7d 100644
--- a/games/rogue/message.c
+++ b/games/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/games/rogue/monster.c b/games/rogue/monster.c
index a81fd3116335..176ac756923a 100644
--- a/games/rogue/monster.c
+++ b/games/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/games/rogue/move.c b/games/rogue/move.c
index cda2ab198a77..86e36cf7523b 100644
--- a/games/rogue/move.c
+++ b/games/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/games/rogue/object.c b/games/rogue/object.c
index 188987d9c8fe..b6f5043ade6c 100644
--- a/games/rogue/object.c
+++ b/games/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/games/rogue/pack.c b/games/rogue/pack.c
index 46c580cfba36..b91bc5a827a6 100644
--- a/games/rogue/pack.c
+++ b/games/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/games/rogue/pathnames.h b/games/rogue/pathnames.h
index a6eb48c9b36e..20e5f2733849 100644
--- a/games/rogue/pathnames.h
+++ b/games/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/games/rogue/play.c b/games/rogue/play.c
index de89a3090fbf..601f89249012 100644
--- a/games/rogue/play.c
+++ b/games/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/games/rogue/random.c b/games/rogue/random.c
index 90e9676c148f..6e2abc6025ac 100644
--- a/games/rogue/random.c
+++ b/games/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/games/rogue/ring.c b/games/rogue/ring.c
index ff5fa8b33e6f..b531fa474e3b 100644
--- a/games/rogue/ring.c
+++ b/games/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/games/rogue/rogue.6 b/games/rogue/rogue.6
index 4fd393627dc8..001a871972fc 100644
--- a/games/rogue/rogue.6
+++ b/games/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/games/rogue/rogue.h b/games/rogue/rogue.h
index f21ae38db67f..94e37db99fc5 100644
--- a/games/rogue/rogue.h
+++ b/games/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/games/rogue/room.c b/games/rogue/room.c
index 33b188cda9c7..88cd0e36dd8e 100644
--- a/games/rogue/room.c
+++ b/games/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/games/rogue/save.c b/games/rogue/save.c
index fc7940904133..135e0db09984 100644
--- a/games/rogue/save.c
+++ b/games/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/games/rogue/score.c b/games/rogue/score.c
index 4b4f06918117..814c1d3915fe 100644
--- a/games/rogue/score.c
+++ b/games/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/games/rogue/spec_hit.c b/games/rogue/spec_hit.c
index 1a1cd55b7a43..e4de5a03b883 100644
--- a/games/rogue/spec_hit.c
+++ b/games/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/games/rogue/throw.c b/games/rogue/throw.c
index 6b27587768cc..a5cf0dadfb83 100644
--- a/games/rogue/throw.c
+++ b/games/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/games/rogue/trap.c b/games/rogue/trap.c
index 55b23ffb2016..bd2aff3723f9 100644
--- a/games/rogue/trap.c
+++ b/games/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/games/rogue/use.c b/games/rogue/use.c
index cc5149401fc1..ebc82b78277e 100644
--- a/games/rogue/use.c
+++ b/games/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/games/rogue/zap.c b/games/rogue/zap.c
index 7180ce59bb57..401d44932faf 100644
--- a/games/rogue/zap.c
+++ b/games/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 */
 
 /*