summaryrefslogtreecommitdiffstats
path: root/usr.bin/csup
diff options
context:
space:
mode:
authorjoel <joel@FreeBSD.org>2010-12-11 08:32:16 +0000
committerjoel <joel@FreeBSD.org>2010-12-11 08:32:16 +0000
commit29af67e52c02dc751039a3117bc88ae6192e891e (patch)
tree5570a8a027e3011357d1c937cdaa4197cc734d59 /usr.bin/csup
parent66c1e42a10bc5d49cfb7ba06c3c81e908ac75e69 (diff)
downloadFreeBSD-src-29af67e52c02dc751039a3117bc88ae6192e891e.zip
FreeBSD-src-29af67e52c02dc751039a3117bc88ae6192e891e.tar.gz
Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change Also add $FreeBSD$ to a few files to keep svn happy. Discussed with: imp, rwatson
Diffstat (limited to 'usr.bin/csup')
-rw-r--r--usr.bin/csup/fnmatch.c6
-rw-r--r--usr.bin/csup/fnmatch.h6
2 files changed, 4 insertions, 8 deletions
diff --git a/usr.bin/csup/fnmatch.c b/usr.bin/csup/fnmatch.c
index a63f016..16e4e21 100644
--- a/usr.bin/csup/fnmatch.c
+++ b/usr.bin/csup/fnmatch.c
@@ -13,10 +13,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 University of
- * California, Berkeley and its contributors.
* 4. 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.
@@ -33,6 +29,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
+ *
* From FreeBSD fnmatch.c 1.11
* $Id: fnmatch.c,v 1.3 1997/08/19 02:34:30 jdp Exp $
*/
diff --git a/usr.bin/csup/fnmatch.h b/usr.bin/csup/fnmatch.h
index 21d2f64..6c51e7e 100644
--- a/usr.bin/csup/fnmatch.h
+++ b/usr.bin/csup/fnmatch.h
@@ -10,10 +10,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 University of
- * California, Berkeley and its contributors.
* 4. 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.
@@ -30,6 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
+ *
* @(#)fnmatch.h 8.1 (Berkeley) 6/2/93
*
* From FreeBSD fnmatch.h 1.7
OpenPOWER on IntegriCloud