Remove clause 3 and 4 from TNF licenses

19 files changed, 29 insertions, 162 deletions

diff --git a/dab/algor.cc b/dab/algor.cc
index 67456899..ce22a1f2 100644
--- a/dab/algor.cc
+++ b/dab/algor.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor.cc,v 1.3 2006/05/14 03:20:42 christos Exp $	*/
+/*	$NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -40,7 +33,7 @@
  * algor.C: Computer algorithm
  */
 #include "defs.h"
-RCSID("$NetBSD: algor.cc,v 1.3 2006/05/14 03:20:42 christos Exp $")
+RCSID("$NetBSD: algor.cc,v 1.4 2008/04/28 20:22:53 martin Exp $")
 
 #include "algor.h"
 #include "board.h"
diff --git a/dab/algor.h b/dab/algor.h
index 24f438d0..bd6b49c4 100644
--- a/dab/algor.h
+++ b/dab/algor.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: algor.h,v 1.3 2006/05/14 03:21:52 christos Exp $	*/
+/*	$NetBSD: algor.h,v 1.4 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/board.cc b/dab/board.cc
index d9a541b2..b8340a04 100644
--- a/dab/board.cc
+++ b/dab/board.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: board.cc,v 1.3 2005/08/09 15:17:41 christos Exp $	*/
+/*	$NetBSD: board.cc,v 1.4 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -40,7 +33,7 @@
  * board.C: Board manipulations
  */
 #include "defs.h"
-RCSID("$NetBSD: board.cc,v 1.3 2005/08/09 15:17:41 christos Exp $")
+RCSID("$NetBSD: board.cc,v 1.4 2008/04/28 20:22:53 martin Exp $")
 
 #include <stdio.h>
 #include <string.h>
diff --git a/dab/board.h b/dab/board.h
index 9a21a0a8..3fe5f7a0 100644
--- a/dab/board.h
+++ b/dab/board.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: board.h,v 1.1.1.1 2003/12/26 17:57:03 christos Exp $	*/
+/*	$NetBSD: board.h,v 1.2 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/box.cc b/dab/box.cc
index 94acbe87..1a00c1de 100644
--- a/dab/box.cc
+++ b/dab/box.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: box.cc,v 1.2 2005/08/09 02:38:32 christos Exp $	*/
+/*	$NetBSD: box.cc,v 1.3 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -40,7 +33,7 @@
  * box.C: Box computations
  */
 #include "defs.h"
-RCSID("$NetBSD: box.cc,v 1.2 2005/08/09 02:38:32 christos Exp $")
+RCSID("$NetBSD: box.cc,v 1.3 2008/04/28 20:22:53 martin Exp $")
 
 #include "box.h"
 #include "board.h"
diff --git a/dab/box.h b/dab/box.h
index 015e9a79..fd13bde3 100644
--- a/dab/box.h
+++ b/dab/box.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: box.h,v 1.1.1.1 2003/12/26 17:57:03 christos Exp $	*/
+/*	$NetBSD: box.h,v 1.2 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/defs.h b/dab/defs.h
index b0bda576..2f4619e7 100644
--- a/dab/defs.h
+++ b/dab/defs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.1.1.1 2003/12/26 17:57:03 christos Exp $	*/
+/*	$NetBSD: defs.h,v 1.2 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/gamescreen.cc b/dab/gamescreen.cc
index 47a9e223..a86ac719 100644
--- a/dab/gamescreen.cc
+++ b/dab/gamescreen.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: gamescreen.cc,v 1.1 2003/12/27 01:16:55 christos Exp $	*/
+/*	$NetBSD: gamescreen.cc,v 1.2 2008/04/28 20:22:53 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -40,7 +33,7 @@
  * gamescreen.C: Common screen functions
  */
 #include "defs.h"
-RCSID("$NetBSD: gamescreen.cc,v 1.1 2003/12/27 01:16:55 christos Exp $")
+RCSID("$NetBSD: gamescreen.cc,v 1.2 2008/04/28 20:22:53 martin Exp $")
 
 #include "gamescreen.h"
 
diff --git a/dab/gamescreen.h b/dab/gamescreen.h
index ca90cb31..ff0b0daa 100644
--- a/dab/gamescreen.h
+++ b/dab/gamescreen.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: gamescreen.h,v 1.1.1.1 2003/12/26 17:57:03 christos Exp $	*/
+/*	$NetBSD: gamescreen.h,v 1.2 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/human.cc b/dab/human.cc
index 9ad042c9..1c3e3e14 100644
--- a/dab/human.cc
+++ b/dab/human.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: human.cc,v 1.2 2005/07/02 15:48:03 jdc Exp $	*/
+/*	$NetBSD: human.cc,v 1.3 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -40,7 +33,7 @@
  * human.C: Human interface for dots, using rogue-like keys.
  */
 #include "defs.h"
-RCSID("$NetBSD: human.cc,v 1.2 2005/07/02 15:48:03 jdc Exp $")
+RCSID("$NetBSD: human.cc,v 1.3 2008/04/28 20:22:54 martin Exp $")
 
 #include "human.h"
 #include "board.h"
diff --git a/dab/human.h b/dab/human.h
index abfe3dee..5d51a506 100644
--- a/dab/human.h
+++ b/dab/human.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: human.h,v 1.2 2006/05/14 06:38:04 christos Exp $	*/
+/*	$NetBSD: human.h,v 1.3 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/main.cc b/dab/main.cc
index 247e3407..97d93eaa 100644
--- a/dab/main.cc
+++ b/dab/main.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.cc,v 1.4 2006/05/14 03:21:23 christos Exp $	*/
+/*	$NetBSD: main.cc,v 1.5 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -40,7 +33,7 @@
  * main.C: Main dots program
  */
 #include "defs.h"
-RCSID("$NetBSD: main.cc,v 1.4 2006/05/14 03:21:23 christos Exp $")
+RCSID("$NetBSD: main.cc,v 1.5 2008/04/28 20:22:54 martin Exp $")
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/dab/player.cc b/dab/player.cc
index 25ae6caa..f7fd3d34 100644
--- a/dab/player.cc
+++ b/dab/player.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: player.cc,v 1.1 2003/12/27 01:16:55 christos Exp $	 */
+/*	$NetBSD: player.cc,v 1.2 2008/04/28 20:22:54 martin Exp $	 */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
  */
 
 #include "defs.h"
-RCSID("$NetBSD: player.cc,v 1.1 2003/12/27 01:16:55 christos Exp $")
+RCSID("$NetBSD: player.cc,v 1.2 2008/04/28 20:22:54 martin Exp $")
 
 #include "board.h"
 #include "player.h"
diff --git a/dab/player.h b/dab/player.h
index 0000c926..fe61b671 100644
--- a/dab/player.h
+++ b/dab/player.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: player.h,v 1.2 2006/05/14 03:21:52 christos Exp $	*/
+/*	$NetBSD: player.h,v 1.3 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/random.cc b/dab/random.cc
index 001c9969..2204c459 100644
--- a/dab/random.cc
+++ b/dab/random.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: random.cc,v 1.2 2003/12/28 17:49:10 thorpej Exp $	*/
+/*	$NetBSD: random.cc,v 1.3 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
  */
 
 #include "defs.h"
-RCSID("$NetBSD: random.cc,v 1.2 2003/12/28 17:49:10 thorpej Exp $")
+RCSID("$NetBSD: random.cc,v 1.3 2008/04/28 20:22:54 martin Exp $")
 
 #include <time.h>
 #include <string.h>
diff --git a/dab/random.h b/dab/random.h
index 4f5b81bc..86b24c65 100644
--- a/dab/random.h
+++ b/dab/random.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: random.h,v 1.2 2003/12/28 17:49:10 thorpej Exp $	*/
+/*	$NetBSD: random.h,v 1.3 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/dab/test.cc b/dab/test.cc
index de031474..a9e0165d 100644
--- a/dab/test.cc
+++ b/dab/test.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: test.cc,v 1.1 2003/12/27 01:16:55 christos Exp $	*/
+/*	$NetBSD: test.cc,v 1.2 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
  */
 
 #include "defs.h"
-RCSID("$NetBSD: test.cc,v 1.1 2003/12/27 01:16:55 christos Exp $")
+RCSID("$NetBSD: test.cc,v 1.2 2008/04/28 20:22:54 martin Exp $")
 
 #include <iostream>
 #include "random.h"
diff --git a/dab/ttyscrn.cc b/dab/ttyscrn.cc
index 9ed58e95..c0234cba 100644
--- a/dab/ttyscrn.cc
+++ b/dab/ttyscrn.cc
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttyscrn.cc,v 1.3 2005/08/09 02:38:32 christos Exp $	*/
+/*	$NetBSD: ttyscrn.cc,v 1.4 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
  */
 
 #include "defs.h"
-RCSID("$NetBSD: ttyscrn.cc,v 1.3 2005/08/09 02:38:32 christos Exp $")
+RCSID("$NetBSD: ttyscrn.cc,v 1.4 2008/04/28 20:22:54 martin Exp $")
 
 #include <stdio.h>
 #include <curses.h>
diff --git a/dab/ttyscrn.h b/dab/ttyscrn.h
index 5e0a5408..3d3e87f5 100644
--- a/dab/ttyscrn.h
+++ b/dab/ttyscrn.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttyscrn.h,v 1.2 2003/12/28 17:49:10 thorpej Exp $	*/
+/*	$NetBSD: ttyscrn.h,v 1.3 2008/04/28 20:22:54 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
  * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED