Drop clauses 3 and 4 from TNF licenses

4 files changed, 6 insertions, 34 deletions

diff --git a/devel/bmake/files/trace.c b/devel/bmake/files/trace.c
index 21f954f2112..5a2fe67873f 100644
--- a/devel/bmake/files/trace.c
+++ b/devel/bmake/files/trace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trace.c,v 1.2 2008/03/09 19:54:29 joerg Exp $	*/
+/*	$NetBSD: trace.c,v 1.3 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000 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
@@ -38,11 +31,11 @@
 
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: trace.c,v 1.2 2008/03/09 19:54:29 joerg Exp $";
+static char rcsid[] = "$NetBSD: trace.c,v 1.3 2008/04/29 05:46:09 martin Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: trace.c,v 1.2 2008/03/09 19:54:29 joerg Exp $");
+__RCSID("$NetBSD: trace.c,v 1.3 2008/04/29 05:46:09 martin Exp $");
 #endif /* not lint */
 #endif
 
diff --git a/devel/bmake/files/trace.h b/devel/bmake/files/trace.h
index 904dd67366f..3cd3958c855 100644
--- a/devel/bmake/files/trace.h
+++ b/devel/bmake/files/trace.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: trace.h,v 1.2 2008/03/09 19:54:29 joerg Exp $	*/
+/*	$NetBSD: trace.h,v 1.3 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000 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/devel/libgetopt/files/getopt.h b/devel/libgetopt/files/getopt.h
index 2c79b0fefb7..5d6bf7ff54c 100644
--- a/devel/libgetopt/files/getopt.h
+++ b/devel/libgetopt/files/getopt.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: getopt.h,v 1.5 2008/02/22 01:27:55 tnn Exp $	*/
+/*	$NetBSD: getopt.h,v 1.6 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000 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/devel/libgetopt/files/getopt_long.c b/devel/libgetopt/files/getopt_long.c
index c082821aad8..2d2b4b7eae1 100644
--- a/devel/libgetopt/files/getopt_long.c
+++ b/devel/libgetopt/files/getopt_long.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getopt_long.c,v 1.2 2005/03/10 21:15:09 tv Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.3 2008/04/29 05:46:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000 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