Update flex license from sourceforge version (is now 2-term BSD)

1 files changed, 19 insertions, 14 deletions

diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index d0c5cc30394..dd32bf438c2 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yylex.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $	*/
+/*	$OpenBSD: yylex.c,v 1.5 2003/06/04 17:34:44 millert Exp $	*/
 
 /* yylex - scanner front-end for flex */
 
@@ -14,21 +14,26 @@
  * Department of Energy and the University of California.
  *
  * 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.
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * 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: /cvs/OpenBSD/src/usr.bin/lex/yylex.c,v 1.4 2001/06/17 07:30:42 deraadt Exp $ */
+/* $Header: /cvs/OpenBSD/src/usr.bin/lex/yylex.c,v 1.5 2003/06/04 17:34:44 millert Exp $ */
 
 #include <ctype.h>
 #include "flexdef.h"