merge with Lite, new RCS id conventions, etc.

25 files changed, 174 insertions, 86 deletions

diff --git a/monop/Makefile b/monop/Makefile
index 67d9eed7..0b692e3d 100644
--- a/monop/Makefile
+++ b/monop/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.8 (Berkeley) 9/2/92
-#	$Id: Makefile,v 1.11 1994/12/22 09:34:57 cgd Exp $
+#	$NetBSD: Makefile,v 1.12 1995/03/23 08:34:32 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	monop
 SRCS=	monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \
diff --git a/monop/brd.dat b/monop/brd.dat
index ff8498d0..987fa293 100644
--- a/monop/brd.dat
+++ b/monop/brd.dat
@@ -1,3 +1,5 @@
+/*	$NetBSD: brd.dat,v 1.2 1995/03/23 08:34:34 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/monop/cards.c b/monop/cards.c
index 8d3ce142..b65f0f26 100644
--- a/monop/cards.c
+++ b/monop/cards.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: cards.c,v 1.3 1995/03/23 08:34:35 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)cards.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: cards.c,v 1.2 1993/08/01 18:53:44 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)cards.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: cards.c,v 1.3 1995/03/23 08:34:35 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/deck.h b/monop/deck.h
index f8857a6c..5516623b 100644
--- a/monop/deck.h
+++ b/monop/deck.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: deck.h,v 1.3 1995/03/23 08:34:36 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)deck.h	5.3 (Berkeley) 6/1/90
- *	$Id: deck.h,v 1.2 1993/08/01 18:53:47 mycroft Exp $
+ *	@(#)deck.h	8.1 (Berkeley) 5/31/93
  */
 
 # define	bool	char
diff --git a/monop/execute.c b/monop/execute.c
index 6649f0ca..f4f49ab4 100644
--- a/monop/execute.c
+++ b/monop/execute.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: execute.c,v 1.3 1995/03/23 08:34:38 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)execute.c	5.5 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: execute.c,v 1.2 1993/08/01 18:53:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)execute.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: execute.c,v 1.3 1995/03/23 08:34:38 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/getinp.c b/monop/getinp.c
index 09724128..d46a9a0f 100644
--- a/monop/getinp.c
+++ b/monop/getinp.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: getinp.c,v 1.3 1995/03/23 08:34:39 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)getinp.c	5.4 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: getinp.c,v 1.2 1993/08/01 18:53:42 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)getinp.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: getinp.c,v 1.3 1995/03/23 08:34:39 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	<stdio.h>
diff --git a/monop/houses.c b/monop/houses.c
index 2da11cc1..1cb4b0a3 100644
--- a/monop/houses.c
+++ b/monop/houses.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: houses.c,v 1.3 1995/03/23 08:34:40 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)houses.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: houses.c,v 1.2 1993/08/01 18:53:40 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)houses.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: houses.c,v 1.3 1995/03/23 08:34:40 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/initdeck.c b/monop/initdeck.c
index f378ed6a..c2ff8310 100644
--- a/monop/initdeck.c
+++ b/monop/initdeck.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: initdeck.c,v 1.3 1995/03/23 08:34:43 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,14 +34,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)initdeck.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: initdeck.c,v 1.2 1993/08/01 18:53:39 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)initdeck.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: initdeck.c,v 1.3 1995/03/23 08:34:43 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	<stdio.h>
diff --git a/monop/jail.c b/monop/jail.c
index b976b119..06055315 100644
--- a/monop/jail.c
+++ b/monop/jail.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: jail.c,v 1.3 1995/03/23 08:34:44 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)jail.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: jail.c,v 1.2 1993/08/01 18:53:38 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)jail.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: jail.c,v 1.3 1995/03/23 08:34:44 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/misc.c b/monop/misc.c
index 114994e5..1a71653b 100644
--- a/monop/misc.c
+++ b/monop/misc.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: misc.c,v 1.4 1995/03/23 08:34:47 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c	5.6 (Berkeley) 3/25/93";*/
-static char rcsid[] = "$Id: misc.c,v 1.3 1993/08/07 08:27:57 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: misc.c,v 1.4 1995/03/23 08:34:47 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/mon.dat b/monop/mon.dat
index 8d5ab4de..bfafa4c0 100644
--- a/monop/mon.dat
+++ b/monop/mon.dat
@@ -1,3 +1,5 @@
+/*	$NetBSD: mon.dat,v 1.2 1995/03/23 08:34:49 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/monop/monop.6 b/monop/monop.6
index 43915791..5412a616 100644
--- a/monop/monop.6
+++ b/monop/monop.6
@@ -1,3 +1,5 @@
+.\"	$NetBSD: monop.6,v 1.8 1995/03/23 08:34:50 cgd Exp $
+.\"
 .\" Copyright (c) 1980 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -29,8 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)monop.6	6.4 (Berkeley) 6/23/90
-.\"	$Id: monop.6,v 1.7 1994/03/19 08:01:23 cgd Exp $
+.\"	@(#)monop.6	6.5 (Berkeley) 3/25/93
 .\"
 .Dd March 25, 1993
 .Dt MONOP 6
diff --git a/monop/monop.c b/monop/monop.c
index bbc20698..8e335226 100644
--- a/monop/monop.c
+++ b/monop/monop.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: monop.c,v 1.3 1995/03/23 08:34:52 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,14 +34,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)monop.c	5.7 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: monop.c,v 1.2 1993/08/01 18:53:35 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)monop.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: monop.c,v 1.3 1995/03/23 08:34:52 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.def"
diff --git a/monop/monop.def b/monop/monop.def
index 1e063e4e..344c4f49 100644
--- a/monop/monop.def
+++ b/monop/monop.def
@@ -1,6 +1,8 @@
+/*	$NetBSD: monop.def,v 1.3 1995/03/23 08:34:54 cgd Exp $	*/
+
 /*-
- * Copyright (c) 1980 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)monop.def	5.4 (Berkeley) 3/25/93
- *	$Id: monop.def,v 1.2 1993/08/07 08:28:03 mycroft Exp $
+ *	@(#)monop.def	5.5 (Berkeley) 5/31/93
  */
 
 # include	"monop.h"
diff --git a/monop/monop.ext b/monop/monop.ext
index a5fc616c..ea955a88 100644
--- a/monop/monop.ext
+++ b/monop/monop.ext
@@ -1,3 +1,5 @@
+/*	$NetBSD: monop.ext,v 1.2 1995/03/23 08:34:58 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/monop/monop.h b/monop/monop.h
index 2198d7dd..1f6110c1 100644
--- a/monop/monop.h
+++ b/monop/monop.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: monop.h,v 1.3 1995/03/23 08:35:00 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)monop.h	5.5 (Berkeley) 6/1/90
- *	$Id: monop.h,v 1.2 1993/08/01 18:53:46 mycroft Exp $
+ *	@(#)monop.h	8.1 (Berkeley) 5/31/93
  */
 
 # include	<stdio.h>
diff --git a/monop/morg.c b/monop/morg.c
index b54d56a0..95708564 100644
--- a/monop/morg.c
+++ b/monop/morg.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: morg.c,v 1.4 1995/03/23 08:35:02 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)morg.c	5.4 (Berkeley) 3/25/93";*/
-static char rcsid[] = "$Id: morg.c,v 1.3 1993/08/07 08:28:05 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)morg.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: morg.c,v 1.4 1995/03/23 08:35:02 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/pathnames.h b/monop/pathnames.h
index a1c347bd..e0cc52f2 100644
--- a/monop/pathnames.h
+++ b/monop/pathnames.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: pathnames.h,v 1.3 1995/03/23 08:35:03 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:53:45 mycroft Exp $
+ *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  */
 
 #define	_PATH_CARDS	"/usr/share/games/cards.pck"
diff --git a/monop/print.c b/monop/print.c
index e2cdad5c..eb49d1fc 100644
--- a/monop/print.c
+++ b/monop/print.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)print.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: print.c,v 1.2 1993/08/01 18:53:33 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/prop.c b/monop/prop.c
index cb4b310a..77b1f6f1 100644
--- a/monop/prop.c
+++ b/monop/prop.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: prop.c,v 1.3 1995/03/23 08:35:06 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)prop.c	5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: prop.c,v 1.2 1993/08/01 18:53:33 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)prop.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: prop.c,v 1.3 1995/03/23 08:35:06 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/prop.dat b/monop/prop.dat
index f9fc072d..6e83098d 100644
--- a/monop/prop.dat
+++ b/monop/prop.dat
@@ -1,3 +1,5 @@
+/*	$NetBSD: prop.dat,v 1.2 1995/03/23 08:35:09 cgd Exp $	*/
+
 /*-
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/monop/rent.c b/monop/rent.c
index 5c596e0f..ef915bb8 100644
--- a/monop/rent.c
+++ b/monop/rent.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: rent.c,v 1.3 1995/03/23 08:35:11 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)rent.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: rent.c,v 1.2 1993/08/01 18:53:32 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)rent.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: rent.c,v 1.3 1995/03/23 08:35:11 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/roll.c b/monop/roll.c
index 5d01fe9c..ddf38a2e 100644
--- a/monop/roll.c
+++ b/monop/roll.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: roll.c,v 1.5 1995/03/23 08:35:13 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)roll.c	5.6 (Berkeley) 9/29/92";*/
-static char rcsid[] = "$Id: roll.c,v 1.4 1993/08/07 08:28:06 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)roll.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: roll.c,v 1.5 1995/03/23 08:35:13 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/monop/spec.c b/monop/spec.c
index a8e39a1e..5b8f32e1 100644
--- a/monop/spec.c
+++ b/monop/spec.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: spec.c,v 1.3 1995/03/23 08:35:16 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)spec.c	5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: spec.c,v 1.2 1993/08/01 18:53:30 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: spec.c,v 1.3 1995/03/23 08:35:16 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"
diff --git a/monop/trade.c b/monop/trade.c
index 9a090b61..e8207f99 100644
--- a/monop/trade.c
+++ b/monop/trade.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: trade.c,v 1.3 1995/03/23 08:35:19 cgd Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)trade.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: trade.c,v 1.2 1993/08/01 18:53:28 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)trade.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: trade.c,v 1.3 1995/03/23 08:35:19 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	"monop.ext"