First pass at removing clauses 3 and 4 from NetBSD licenses.

Not sure what's more surprising: how long it took for NetBSD to
catch up to the rest of the BSDs (including UCB), or the amount of
code that NetBSD has claimed for itself without attributing to the
actual authors.

OK deraadt@

3 files changed, 2 insertions, 23 deletions

diff --git a/regress/lib/libc/popen/popen.c b/regress/lib/libc/popen/popen.c
index 95ea67f31bf..916cb71b037 100644
--- a/regress/lib/libc/popen/popen.c
+++ b/regress/lib/libc/popen/popen.c
@@ -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/regress/lib/libc/time/strptime/main.c b/regress/lib/libc/time/strptime/main.c
index d1d9c394a5d..c4e06a9b590 100644
--- a/regress/lib/libc/time/strptime/main.c
+++ b/regress/lib/libc/time/strptime/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.1 2004/01/20 16:47:56 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.2 2008/06/26 05:42:05 ray Exp $	*/
 /*	$NetBSD: main.c,v 1.4 2002/02/21 07:38:18 itojun Exp $	*/
 
 /*-
@@ -13,13 +13,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/regress/lib/libskey/skeytest.c b/regress/lib/libskey/skeytest.c
index ce06a39f055..3da99cd42c3 100644
--- a/regress/lib/libskey/skeytest.c
+++ b/regress/lib/libskey/skeytest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skeytest.c,v 1.2 2003/07/31 21:48:07 deraadt Exp $	*/
+/*	$OpenBSD: skeytest.c,v 1.3 2008/06/26 05:42:05 ray Exp $	*/
 /*	$NetBSD: skeytest.c,v 1.3 2002/02/21 07:38:18 itojun Exp $	*/
 
 /*-
@@ -13,13 +13,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