Vern says:

Yes, this came up a while ago, and I put together a flex release with
a modified copyright that begins:
     Redistribution and use in source and binary forms, with or
     without modification, are permitted provided that:
[...] feel free to update the copyrights in each of the files with the
one in COPYING.

15 files changed, 172 insertions, 172 deletions

diff --git a/usr.bin/lex/COPYING b/usr.bin/lex/COPYING
index dcb775e7c60..63c8555826d 100644
--- a/usr.bin/lex/COPYING
+++ b/usr.bin/lex/COPYING
@@ -12,10 +12,10 @@ which operates under a contract with the Department of Energy:
 	to contract no. DE-AC03-76SF00098 between the United States
 	Department of Energy and the University of California.
 
-	Redistribution and use in source and binary forms are permitted
-	provided that: (1) source distributions retain this entire
-	copyright notice and comment, and (2) distributions including
-	binaries display the following acknowledgement:  ``This product
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that: (1) source distributions
+	retain this entire copyright notice and comment, and (2) distributions
+	including binaries display the following acknowledgement:  ``This product
 	includes software developed by the University of California,
 	Berkeley and its contributors'' in the documentation or other
 	materials provided with the distribution and in all advertising
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index 6219386677f..5c8e41d6357 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,6 +1,6 @@
-/*	$OpenBSD: FlexLexer.h,v 1.3 1996/07/13 22:21:55 millert Exp $	*/
+/*	$OpenBSD: FlexLexer.h,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
-// $Header: /home/cvs/src/usr.bin/lex/FlexLexer.h,v 1.3 1996/07/13 22:21:55 millert Exp $
+// $Header: /home/cvs/src/usr.bin/lex/FlexLexer.h,v 1.4 2001/06/17 07:30:42 deraadt Exp $
 
 // FlexLexer.h -- define interfaces for lexical analyzer classes generated
 //		  by flex
@@ -11,16 +11,16 @@
 // This code is derived from software contributed to Berkeley by
 // Kent Williams and Tom Epperly.
 //
-// Redistribution and use in source and binary forms are permitted provided
-// that: (1) source distributions retain this entire copyright notice and
-// comment, and (2) distributions including binaries display the following
-// acknowledgement:  ``This product includes software developed by the
-// University of California, Berkeley and its contributors'' in the
-// documentation or other materials provided with the distribution and in
-// all advertising materials mentioning features or use of this software.
-// 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.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that: (1) source distributions
+// retain this entire copyright notice and comment, and (2) distributions
+// including binaries display the following acknowledgement:  ``This product
+// includes software developed by the University of California, Berkeley
+// and its contributors'' in the documentation or other materials provided
+// with the distribution and in all advertising materials mentioning
+// features or use of this software. 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.
 // THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 // WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c
index f04cef66e32..7565e38e26f 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccl.c,v 1.3 1996/07/13 22:21:56 millert Exp $	*/
+/*	$OpenBSD: ccl.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* ccl - routines for character classes */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/ccl.c,v 1.3 1996/07/13 22:21:56 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/ccl.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index abc05f7077a..5f459f96da1 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dfa.c,v 1.3 1996/07/13 22:21:57 millert Exp $	*/
+/*	$OpenBSD: dfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* dfa - DFA construction routines */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/dfa.c,v 1.3 1996/07/13 22:21:57 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/dfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index e3c0c9299c5..67d5179fc99 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ecs.c,v 1.3 1996/07/13 22:21:57 millert Exp $	*/
+/*	$OpenBSD: ecs.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* ecs - equivalence class routines */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/ecs.c,v 1.3 1996/07/13 22:21:57 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/ecs.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index 088371dc388..f82872a2ebc 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flexdef.h,v 1.4 1997/07/25 21:05:28 mickey Exp $	*/
+/*	$OpenBSD: flexdef.h,v 1.5 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* flexdef - definitions file for flex */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* @(#) $Header: /home/cvs/src/usr.bin/lex/flexdef.h,v 1.4 1997/07/25 21:05:28 mickey Exp $ (LBL) */
+/* @(#) $Header: /home/cvs/src/usr.bin/lex/flexdef.h,v 1.5 2001/06/17 07:30:42 deraadt Exp $ (LBL) */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index a1ae45e8c69..298143c7542 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gen.c,v 1.4 1998/11/24 01:21:36 deraadt Exp $	*/
+/*	$OpenBSD: gen.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* gen - actual generation (writing) of flex scanners */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/gen.c,v 1.4 1998/11/24 01:21:36 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/gen.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 8315a1428a1..ba4e146ee07 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.4 1998/08/17 03:20:25 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* flex - tool to generate fast lexical analyzers */
 
@@ -13,16 +13,16 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -34,7 +34,7 @@ char copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-/* $Header: /home/cvs/src/usr.bin/lex/main.c,v 1.4 1998/08/17 03:20:25 deraadt Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/main.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
 
 
 #include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index 40a75969d5e..ff5fdad7383 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.4 1997/07/25 21:05:30 mickey Exp $	*/
+/*	$OpenBSD: misc.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* misc - miscellaneous flex routines */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/misc.c,v 1.4 1997/07/25 21:05:30 mickey Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/misc.c,v 1.5 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index 3197439b000..46741789c69 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfa.c,v 1.3 1996/07/13 22:22:10 millert Exp $	*/
+/*	$OpenBSD: nfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* nfa - NFA construction routines */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/nfa.c,v 1.3 1996/07/13 22:22:10 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/nfa.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index 0b89e879ec7..843d3953e31 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.3 1996/07/13 22:22:12 millert Exp $	*/
+/*	$OpenBSD: parse.y,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* parse.y - parser for flex input */
 
@@ -20,22 +20,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/parse.y,v 1.3 1996/07/13 22:22:12 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/parse.y,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 
 /* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index 1f5ed23344e..8aa9a83df95 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scan.l,v 1.3 1996/07/13 22:22:13 millert Exp $	*/
+/*	$OpenBSD: scan.l,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* scan.l - scanner for flex input */
 
@@ -14,22 +14,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/scan.l,v 1.3 1996/07/13 22:22:13 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/scan.l,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index 25790940c1b..9568dc44a4f 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sym.c,v 1.3 1996/07/13 22:22:13 millert Exp $	*/
+/*	$OpenBSD: sym.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* sym - symbol table routines */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/sym.c,v 1.3 1996/07/13 22:22:13 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/sym.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index dc3fefa3d49..6bae5860561 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tblcmp.c,v 1.3 1996/07/13 22:22:14 millert Exp $	*/
+/*	$OpenBSD: tblcmp.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* tblcmp - table compression routines */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/tblcmp.c,v 1.3 1996/07/13 22:22:14 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/tblcmp.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index 47b8d0fa5b2..fbf680b04aa 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yylex.c,v 1.3 1996/07/13 22:22:15 millert Exp $	*/
+/*	$OpenBSD: yylex.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
 
 /* yylex - scanner front-end for flex */
 
@@ -13,22 +13,22 @@
  * to contract no. DE-AC03-76SF00098 between the United States
  * Department of Energy and the University of California.
  *
- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source distributions
+ * retain this entire copyright notice and comment, and (2) distributions
+ * including binaries display the following acknowledgement:  ``This product
+ * includes software developed by the University of California, Berkeley
+ * and its contributors'' in the documentation or other materials provided
+ * with the distribution and in all advertising materials mentioning
+ * features or use of this software. 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /home/cvs/src/usr.bin/lex/yylex.c,v 1.3 1996/07/13 22:22:15 millert Exp $ */
+/* $Header: /home/cvs/src/usr.bin/lex/yylex.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
 
 #include <ctype.h>
 #include "flexdef.h"