Convert the 4 clause UCB license to the 3 clause license.

3 files changed, 7 insertions, 19 deletions

diff --git a/pkgtools/libnbcompat/files/nbcompat/fts.h b/pkgtools/libnbcompat/files/nbcompat/fts.h
index 40a2429f20e..a91f7ee23f6 100644
--- a/pkgtools/libnbcompat/files/nbcompat/fts.h
+++ b/pkgtools/libnbcompat/files/nbcompat/fts.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: fts.h,v 1.1 2003/09/03 13:35:51 jlam Exp $	*/
+/*	$NetBSD: fts.h,v 1.2 2003/12/19 22:16:14 grant Exp $	*/
 
 /*
  * Copyright (c) 1989, 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/pkgtools/libnbcompat/files/nbcompat/glob.h b/pkgtools/libnbcompat/files/nbcompat/glob.h
index b913c94fcab..a01178623e5 100644
--- a/pkgtools/libnbcompat/files/nbcompat/glob.h
+++ b/pkgtools/libnbcompat/files/nbcompat/glob.h
@@ -1,5 +1,5 @@
-/*	$Id: glob.h,v 1.1 2003/09/05 18:36:07 jlam Exp $	*/
-/*	$NetBSD: glob.h,v 1.1 2003/09/05 18:36:07 jlam Exp $	*/
+/* $Id: glob.h,v 1.2 2003/12/19 22:16:14 grant Exp $ */
+/* from NetBSD: glob.h,v 1.13 2001/03/16 21:02:42 christos Exp */
 
 /*
  * Copyright (c) 1989, 1993
@@ -16,11 +16,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/pkgtools/libnbcompat/files/pwcache.h b/pkgtools/libnbcompat/files/pwcache.h
index 8c673c08b98..c3d2f6456b4 100644
--- a/pkgtools/libnbcompat/files/pwcache.h
+++ b/pkgtools/libnbcompat/files/pwcache.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwcache.h,v 1.2 2003/06/24 14:09:21 jschauma Exp $	*/
+/*	$NetBSD: pwcache.h,v 1.3 2003/12/19 22:16:14 grant Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -16,11 +16,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.
  *