Drop clauses 3 and 4 from TNF licenses

6 files changed, 9 insertions, 51 deletions

diff --git a/archivers/pax/files/dumptar.c b/archivers/pax/files/dumptar.c
index 77e8500c0b1..3e39580ce58 100644
--- a/archivers/pax/files/dumptar.c
+++ b/archivers/pax/files/dumptar.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumptar.c,v 1.1 2004/08/21 03:28:56 jlam Exp $	*/
+/*	$NetBSD: dumptar.c,v 1.2 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 2004 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/archivers/pax/files/ftree.c b/archivers/pax/files/ftree.c
index 224cdffcaaf..5a63856b8a7 100644
--- a/archivers/pax/files/ftree.c
+++ b/archivers/pax/files/ftree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftree.c,v 1.11 2008/02/07 22:27:53 joerg Exp $	*/
+/*	$NetBSD: ftree.c,v 1.12 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -48,13 +48,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
@@ -84,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ftree.c,v 1.11 2008/02/07 22:27:53 joerg Exp $");
+__RCSID("$NetBSD: ftree.c,v 1.12 2008/04/29 05:46:09 martin Exp $");
 #endif
 #endif /* not lint */
 
diff --git a/archivers/pax/files/getid.c b/archivers/pax/files/getid.c
index b5e51c9aa98..c358a991b20 100644
--- a/archivers/pax/files/getid.c
+++ b/archivers/pax/files/getid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getid.c,v 1.2 2004/08/21 03:28:56 jlam Exp $	*/
+/*	$NetBSD: getid.c,v 1.3 2008/04/29 05:46:09 martin Exp $	*/
 /*	from: NetBSD: getpwent.c,v 1.48 2000/10/03 03:22:26 enami Exp */
 /*	from: NetBSD: getgrent.c,v 1.41 2002/01/12 23:51:30 lukem Exp */
 
@@ -46,13 +46,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/archivers/pax/files/pack_dev.c b/archivers/pax/files/pack_dev.c
index c63ae3b4b0b..80a19177c8d 100644
--- a/archivers/pax/files/pack_dev.c
+++ b/archivers/pax/files/pack_dev.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pack_dev.c,v 1.3 2007/09/06 20:10:22 joerg Exp $	*/
+/*	$NetBSD: pack_dev.c,v 1.4 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 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
@@ -48,7 +41,7 @@
 #include <sys/cdefs.h>
 #endif
 #if !defined(lint)
-__RCSID("$NetBSD: pack_dev.c,v 1.3 2007/09/06 20:10:22 joerg Exp $");
+__RCSID("$NetBSD: pack_dev.c,v 1.4 2008/04/29 05:46:09 martin Exp $");
 #endif /* not lint */
 
 #if HAVE_SYS_TYPES_H
diff --git a/archivers/pax/files/pack_dev.h b/archivers/pax/files/pack_dev.h
index d07169ca099..b7566e50863 100644
--- a/archivers/pax/files/pack_dev.h
+++ b/archivers/pax/files/pack_dev.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pack_dev.h,v 1.2 2004/08/21 03:28:56 jlam Exp $	*/
+/*	$NetBSD: pack_dev.h,v 1.3 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 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/archivers/pax/files/spec.c b/archivers/pax/files/spec.c
index 9e0aa928541..6dba9ba06e7 100644
--- a/archivers/pax/files/spec.c
+++ b/archivers/pax/files/spec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec.c,v 1.2 2004/08/21 03:28:56 jlam Exp $	*/
+/*	$NetBSD: spec.c,v 1.3 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -44,13 +44,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
@@ -80,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)spec.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: spec.c,v 1.2 2004/08/21 03:28:56 jlam Exp $");
+__RCSID("$NetBSD: spec.c,v 1.3 2008/04/29 05:46:09 martin Exp $");
 #endif
 #endif /* not lint */