summaryrefslogtreecommitdiff
path: root/usr.bin/lex/COPYING
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-04 17:34:45 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-04 17:34:45 +0000
commita76522be0e65260fa24df62bbc8d3feeb6a6e4f1 (patch)
tree59065ee48300511234f23bc18218feec27faea04 /usr.bin/lex/COPYING
parent0c5da668b2ed8eacf42aea5ea3827daaa6756024 (diff)
Update flex license from sourceforge version (is now 2-term BSD)
Diffstat (limited to 'usr.bin/lex/COPYING')
-rw-r--r--usr.bin/lex/COPYING20
1 files changed, 11 insertions, 9 deletions
diff --git a/usr.bin/lex/COPYING b/usr.bin/lex/COPYING
index 63c8555826d..fdfcd894b56 100644
--- a/usr.bin/lex/COPYING
+++ b/usr.bin/lex/COPYING
@@ -13,15 +13,17 @@ which operates under a contract with the Department of Energy:
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
+ 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