From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 19 Aug 2004 17:36:42 +0000 (+0000)
Subject: Remove the advertising clause where possible as per the directive from
X-Git-Tag: v2.0.1~10473
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/f53291fc976fd0f53b5616c697867340b558f5ca

Remove the advertising clause where possible as per the directive from
UC Berkeley (see /usr/src/COPYRIGHT) and with Ken Smith's permission
for mv.c.

>From:     Ken Smith <kensmith@cse.Buffalo.EDU>
>Subject:  mv.c license change
>To:       Matthew Dillon <dillon@apollo.backplane.com>
>Date:     Thu, 19 Aug 2004 13:30:28 -0400
>
>Yes, you have my permission to remove the advertising clause from
>the license agreement in /usr/src/bin/mv/mv.c.
>
>--
>                                                Ken Smith
>- From there to here, from here to      |       kensmith@cse.buffalo.edu
>  there, funny things are everywhere.   |
>                      - Theodore Geisel |
---

diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index eb80a1ab83..7b9d14ab61 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -13,11 +13,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.
  *
@@ -36,7 +32,7 @@
  * @(#) Copyright (c) 1989, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mv.c	8.2 (Berkeley) 4/2/94
  * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/bin/mv/mv.c,v 1.24.2.6 2004/03/24 08:34:36 pjd Exp $
- * $DragonFly: src/bin/mv/mv.c,v 1.5 2004/05/03 18:54:37 cpressey Exp $
+ * $DragonFly: src/bin/mv/mv.c,v 1.6 2004/08/19 17:36:42 dillon Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/mv/pathnames.h b/bin/mv/pathnames.h
index 7c688930b7..cce60e4860 100644
--- a/bin/mv/pathnames.h
+++ b/bin/mv/pathnames.h
@@ -10,11 +10,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.
  *
@@ -32,7 +28,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
  * $FreeBSD: src/bin/mv/pathnames.h,v 1.5 1999/08/27 23:14:37 peter Exp $
- * $DragonFly: src/bin/mv/pathnames.h,v 1.2 2003/06/17 04:22:50 dillon Exp $
+ * $DragonFly: src/bin/mv/pathnames.h,v 1.3 2004/08/19 17:36:42 dillon Exp $
  */
 
 #define	_PATH_RM	"/bin/rm"