Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22269, verified by myself.

25 files changed, 66 insertions, 166 deletions

diff --git a/monop/brd.dat b/monop/brd.dat
index 987fa293..cf6af308 100644
--- a/monop/brd.dat
+++ b/monop/brd.dat
@@ -1,4 +1,4 @@
-/*	$NetBSD: brd.dat,v 1.2 1995/03/23 08:34:34 cgd Exp $	*/
+/*	$NetBSD: brd.dat,v 1.3 2003/08/07 09:37:27 agc Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/cards.c b/monop/cards.c
index fad1950d..db31fb5b 100644
--- a/monop/cards.c
+++ b/monop/cards.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cards.c,v 1.12 2002/08/12 02:38:13 itojun Exp $	*/
+/*	$NetBSD: cards.c,v 1.13 2003/08/07 09:37:27 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)cards.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: cards.c,v 1.12 2002/08/12 02:38:13 itojun Exp $");
+__RCSID("$NetBSD: cards.c,v 1.13 2003/08/07 09:37:27 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/deck.h b/monop/deck.h
index 947b58cc..a5d5159a 100644
--- a/monop/deck.h
+++ b/monop/deck.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: deck.h,v 1.5 1999/08/21 10:40:03 simonb Exp $	*/
+/*	$NetBSD: deck.h,v 1.6 2003/08/07 09:37:27 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/execute.c b/monop/execute.c
index 608688ec..f1e63433 100644
--- a/monop/execute.c
+++ b/monop/execute.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: execute.c,v 1.9 2003/04/21 01:25:27 christos Exp $	*/
+/*	$NetBSD: execute.c,v 1.10 2003/08/07 09:37:27 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)execute.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: execute.c,v 1.9 2003/04/21 01:25:27 christos Exp $");
+__RCSID("$NetBSD: execute.c,v 1.10 2003/08/07 09:37:27 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/getinp.c b/monop/getinp.c
index 0c4cf326..9c4f948c 100644
--- a/monop/getinp.c
+++ b/monop/getinp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getinp.c,v 1.10 2003/01/06 13:04:55 wiz Exp $	*/
+/*	$NetBSD: getinp.c,v 1.11 2003/08/07 09:37:27 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getinp.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getinp.c,v 1.10 2003/01/06 13:04:55 wiz Exp $");
+__RCSID("$NetBSD: getinp.c,v 1.11 2003/08/07 09:37:27 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/houses.c b/monop/houses.c
index 27dacc72..b5a2d8b0 100644
--- a/monop/houses.c
+++ b/monop/houses.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: houses.c,v 1.6 1999/09/08 21:17:51 jsm Exp $	*/
+/*	$NetBSD: houses.c,v 1.7 2003/08/07 09:37:27 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)houses.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: houses.c,v 1.6 1999/09/08 21:17:51 jsm Exp $");
+__RCSID("$NetBSD: houses.c,v 1.7 2003/08/07 09:37:27 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/initdeck.c b/monop/initdeck.c
index 396b0b59..76c0bc74 100644
--- a/monop/initdeck.c
+++ b/monop/initdeck.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: initdeck.c,v 1.14 2001/07/22 13:34:01 wiz Exp $	*/
+/*	$NetBSD: initdeck.c,v 1.15 2003/08/07 09:37:28 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)initdeck.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: initdeck.c,v 1.14 2001/07/22 13:34:01 wiz Exp $");
+__RCSID("$NetBSD: initdeck.c,v 1.15 2003/08/07 09:37:28 agc Exp $");
 #endif
 #endif /* not lint */
 #endif /* __NetBSD__ */
diff --git a/monop/jail.c b/monop/jail.c
index 8aa5360b..f6ad0979 100644
--- a/monop/jail.c
+++ b/monop/jail.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: jail.c,v 1.5 1999/08/21 10:40:03 simonb Exp $	*/
+/*	$NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)jail.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: jail.c,v 1.5 1999/08/21 10:40:03 simonb Exp $");
+__RCSID("$NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/malloc.c b/monop/malloc.c
index 53722898..7596d815 100644
--- a/monop/malloc.c
+++ b/monop/malloc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: malloc.c,v 1.1 2003/04/21 01:23:06 christos Exp $	*/
+/*	$NetBSD: malloc.c,v 1.2 2003/08/07 09:37:28 agc Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)malloc.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: malloc.c,v 1.1 2003/04/21 01:23:06 christos Exp $");
+__RCSID("$NetBSD: malloc.c,v 1.2 2003/08/07 09:37:28 agc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/monop/misc.c b/monop/misc.c
index f06ae323..27612a0d 100644
--- a/monop/misc.c
+++ b/monop/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.10 2001/01/16 02:41:17 cgd Exp $	*/
+/*	$NetBSD: misc.c,v 1.11 2003/08/07 09:37:28 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: misc.c,v 1.10 2001/01/16 02:41:17 cgd Exp $");
+__RCSID("$NetBSD: misc.c,v 1.11 2003/08/07 09:37:28 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/mon.dat b/monop/mon.dat
index bfafa4c0..be1b68be 100644
--- a/monop/mon.dat
+++ b/monop/mon.dat
@@ -1,4 +1,4 @@
-/*	$NetBSD: mon.dat,v 1.2 1995/03/23 08:34:49 cgd Exp $	*/
+/*	$NetBSD: mon.dat,v 1.3 2003/08/07 09:37:28 agc Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/monop.6 b/monop/monop.6
index c03ad4f8..82d23494 100644
--- a/monop/monop.6
+++ b/monop/monop.6
@@ -1,4 +1,4 @@
-.\"	$NetBSD: monop.6,v 1.15 2003/06/27 22:49:57 wiz Exp $
+.\"	$NetBSD: monop.6,v 1.16 2003/08/07 09:37:28 agc Exp $
 .\"
 .\" Copyright (c) 1980 The Regents of the University of California.
 .\" All rights reserved.
@@ -11,11 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
diff --git a/monop/monop.c b/monop/monop.c
index 12d3b5fe..0e353e58 100644
--- a/monop/monop.c
+++ b/monop/monop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: monop.c,v 1.13 2003/04/21 01:25:27 christos Exp $	*/
+/*	$NetBSD: monop.c,v 1.14 2003/08/07 09:37:28 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)monop.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: monop.c,v 1.13 2003/04/21 01:25:27 christos Exp $");
+__RCSID("$NetBSD: monop.c,v 1.14 2003/08/07 09:37:28 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/monop.def b/monop/monop.def
index 4bca6372..63649ee6 100644
--- a/monop/monop.def
+++ b/monop/monop.def
@@ -1,4 +1,4 @@
-/*	$NetBSD: monop.def,v 1.6 1999/09/08 21:17:52 jsm Exp $	*/
+/*	$NetBSD: monop.def,v 1.7 2003/08/07 09:37:28 agc Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/monop.ext b/monop/monop.ext
index 5903f3d9..fe227517 100644
--- a/monop/monop.ext
+++ b/monop/monop.ext
@@ -1,4 +1,4 @@
-/*	$NetBSD: monop.ext,v 1.4 1999/09/08 21:17:52 jsm Exp $	*/
+/*	$NetBSD: monop.ext,v 1.5 2003/08/07 09:37:29 agc Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/monop.h b/monop/monop.h
index 23896e76..4b87996f 100644
--- a/monop/monop.h
+++ b/monop/monop.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: monop.h,v 1.10 1999/09/30 18:01:32 jsm Exp $	*/
+/*	$NetBSD: monop.h,v 1.11 2003/08/07 09:37:29 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/morg.c b/monop/morg.c
index 2c74f917..cfdbff98 100644
--- a/monop/morg.c
+++ b/monop/morg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: morg.c,v 1.8 1999/09/08 21:17:52 jsm Exp $	*/
+/*	$NetBSD: morg.c,v 1.9 2003/08/07 09:37:29 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)morg.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: morg.c,v 1.8 1999/09/08 21:17:52 jsm Exp $");
+__RCSID("$NetBSD: morg.c,v 1.9 2003/08/07 09:37:29 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/pathnames.h b/monop/pathnames.h
index e0cc52f2..2b8f9129 100644
--- a/monop/pathnames.h
+++ b/monop/pathnames.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pathnames.h,v 1.3 1995/03/23 08:35:03 cgd Exp $	*/
+/*	$NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:29 agc Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/print.c b/monop/print.c
index 5f0dcd22..8446abc7 100644
--- a/monop/print.c
+++ b/monop/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.6 1999/09/08 21:17:52 jsm Exp $	*/
+/*	$NetBSD: print.c,v 1.7 2003/08/07 09:37:29 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.6 1999/09/08 21:17:52 jsm Exp $");
+__RCSID("$NetBSD: print.c,v 1.7 2003/08/07 09:37:29 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/prop.c b/monop/prop.c
index c1a016f5..dd0fd2c4 100644
--- a/monop/prop.c
+++ b/monop/prop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop.c,v 1.7 2001/01/16 02:41:17 cgd Exp $	*/
+/*	$NetBSD: prop.c,v 1.8 2003/08/07 09:37:29 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)prop.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: prop.c,v 1.7 2001/01/16 02:41:17 cgd Exp $");
+__RCSID("$NetBSD: prop.c,v 1.8 2003/08/07 09:37:29 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/prop.dat b/monop/prop.dat
index 6e83098d..126085da 100644
--- a/monop/prop.dat
+++ b/monop/prop.dat
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop.dat,v 1.2 1995/03/23 08:35:09 cgd Exp $	*/
+/*	$NetBSD: prop.dat,v 1.3 2003/08/07 09:37:29 agc Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/monop/rent.c b/monop/rent.c
index c7b0cc9a..4ba229d5 100644
--- a/monop/rent.c
+++ b/monop/rent.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rent.c,v 1.5 1999/08/21 10:40:04 simonb Exp $	*/
+/*	$NetBSD: rent.c,v 1.6 2003/08/07 09:37:29 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)rent.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: rent.c,v 1.5 1999/08/21 10:40:04 simonb Exp $");
+__RCSID("$NetBSD: rent.c,v 1.6 2003/08/07 09:37:29 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/roll.c b/monop/roll.c
index 75578ee3..07395fa9 100644
--- a/monop/roll.c
+++ b/monop/roll.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: roll.c,v 1.8 2002/06/02 22:17:37 wiz Exp $	*/
+/*	$NetBSD: roll.c,v 1.9 2003/08/07 09:37:29 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)roll.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: roll.c,v 1.8 2002/06/02 22:17:37 wiz Exp $");
+__RCSID("$NetBSD: roll.c,v 1.9 2003/08/07 09:37:29 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/spec.c b/monop/spec.c
index 702faaa4..604dc175 100644
--- a/monop/spec.c
+++ b/monop/spec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec.c,v 1.6 1999/09/08 21:17:52 jsm Exp $	*/
+/*	$NetBSD: spec.c,v 1.7 2003/08/07 09:37:30 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: spec.c,v 1.6 1999/09/08 21:17:52 jsm Exp $");
+__RCSID("$NetBSD: spec.c,v 1.7 2003/08/07 09:37:30 agc Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/monop/trade.c b/monop/trade.c
index a13d8ac9..e28a68e3 100644
--- a/monop/trade.c
+++ b/monop/trade.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trade.c,v 1.7 1999/09/30 18:01:32 jsm Exp $	*/
+/*	$NetBSD: trade.c,v 1.8 2003/08/07 09:37:30 agc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)trade.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: trade.c,v 1.7 1999/09/30 18:01:32 jsm Exp $");
+__RCSID("$NetBSD: trade.c,v 1.8 2003/08/07 09:37:30 agc Exp $");
 #endif
 #endif /* not lint */