kill clause 3 and 4 from several of my copyrights, cleanup.

9 files changed, 22 insertions, 61 deletions

diff --git a/distrib/crunch/crunchide/elf_hide.c b/distrib/crunch/crunchide/elf_hide.c
index f1e23ba8295..365b5903194 100644
--- a/distrib/crunch/crunchide/elf_hide.c
+++ b/distrib/crunch/crunchide/elf_hide.c
@@ -1,7 +1,8 @@
-/* $OpenBSD: elf_hide.c,v 1.8 2003/01/27 19:41:30 deraadt Exp $ */
+/* $OpenBSD: elf_hide.c,v 1.9 2003/06/03 01:35:30 drahn Exp $ */
 
 /*
- * Copyright (c) 1997 Dale Rahn. All rights reserved.
+ * Copyright (c) 1997 Dale Rahn.
+ * All rights reserved.
  *
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,11 +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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/libexec/ld.so/i386/ldasm.S b/libexec/ld.so/i386/ldasm.S
index 230deaa30a2..b298e764b2e 100644
--- a/libexec/ld.so/i386/ldasm.S
+++ b/libexec/ld.so/i386/ldasm.S
@@ -1,7 +1,8 @@
-/*	$OpenBSD: ldasm.S,v 1.5 2003/05/30 01:13:53 drahn Exp $ */
+/*	$OpenBSD: ldasm.S,v 1.6 2003/06/03 01:35:30 drahn Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -11,12 +12,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 under OpenBSD by
- *	Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/sys/arch/macppc/dev/uni_n.c b/sys/arch/macppc/dev/uni_n.c
index 3f4dcc6e3b6..87eb4e7a262 100644
--- a/sys/arch/macppc/dev/uni_n.c
+++ b/sys/arch/macppc/dev/uni_n.c
@@ -1,7 +1,8 @@
-/*	$OpenBSD: uni_n.c,v 1.6 2002/09/15 09:01:58 deraadt Exp $	*/
+/*	$OpenBSD: uni_n.c,v 1.7 2003/06/03 01:35:30 drahn Exp $	*/
 
 /*
- * Copyright (c) 1998-2001 Dale Rahn. All rights reserved.
+ * Copyright (c) 1998-2001 Dale Rahn.
+ * All rights reserved.
  *
  *   
  * Redistribution and use in source and binary forms, with or without
@@ -12,11 +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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
index 1efaea0823b..8d9514b11bd 100644
--- a/sys/arch/macppc/stand/tbxidata/bsd.tbxi
+++ b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
@@ -1,8 +1,9 @@
 <CHRP-BOOT>
 <LICENSE>
-/*      $OpenBSD: bsd.tbxi,v 1.7 2003/02/12 23:07:28 deraadt Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.8 2003/06/03 01:35:30 drahn Exp $      */
 /*
- * Copyright (c) 2001 Dale Rahn. All rights reserved.
+ * Copyright (c) 2001 Dale Rahn.
+ * All rights reserved.
  *
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,11 +14,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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/mvme68k/dev/bug.c b/sys/arch/mvme68k/dev/bug.c
index 995ff686574..ba28b90a15c 100644
--- a/sys/arch/mvme68k/dev/bug.c
+++ b/sys/arch/mvme68k/dev/bug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bug.c,v 1.5 2002/04/27 23:21:05 miod Exp $ */
+/*	$OpenBSD: bug.c,v 1.6 2003/06/03 01:35:30 drahn Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn.
@@ -12,11 +12,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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/mvme68k/dev/bugtty.c b/sys/arch/mvme68k/dev/bugtty.c
index c5a4556ddb0..60d83bce682 100644
--- a/sys/arch/mvme68k/dev/bugtty.c
+++ b/sys/arch/mvme68k/dev/bugtty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugtty.c,v 1.8 2002/06/12 03:49:53 miod Exp $ */
+/*	$OpenBSD: bugtty.c,v 1.9 2003/06/03 01:35:30 drahn Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn.
@@ -12,11 +12,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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/powerpc/include/profile.h b/sys/arch/powerpc/include/profile.h
index 2fcf2125a22..2c13cac5766 100644
--- a/sys/arch/powerpc/include/profile.h
+++ b/sys/arch/powerpc/include/profile.h
@@ -1,7 +1,8 @@
-/*	$OpenBSD: profile.h,v 1.5 2002/11/11 16:44:04 drahn Exp $ */
+/*	$OpenBSD: profile.h,v 1.6 2003/06/03 01:35:30 drahn Exp $ */
 
 /*
- * Copyright (c) 1998 Dale Rahn. All rights reserved.
+ * Copyright (c) 1998 Dale Rahn.
+ * All rights reserved.
  *
  *   
  * Redistribution and use in source and binary forms, with or without
@@ -12,11 +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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index 90a3018f056..d9e1baaabae 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,7 +1,8 @@
-/*	$OpenBSD: pmap.c,v 1.80 2003/02/26 21:54:44 drahn Exp $ */
+/*	$OpenBSD: pmap.c,v 1.81 2003/06/03 01:35:30 drahn Exp $ */
 
 /*
- * Copyright (c) 2001, 2002 Dale Rahn. All rights reserved.
+ * Copyright (c) 2001, 2002 Dale Rahn.
+ * All rights reserved.
  *
  *   
  * Redistribution and use in source and binary forms, with or without
@@ -12,11 +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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/arch/powerpc/powerpc/setjmp.S b/sys/arch/powerpc/powerpc/setjmp.S
index 044529cc127..aa3d98fbfa3 100644
--- a/sys/arch/powerpc/powerpc/setjmp.S
+++ b/sys/arch/powerpc/powerpc/setjmp.S
@@ -1,9 +1,10 @@
-/*	$OpenBSD: setjmp.S,v 1.6 2002/09/15 09:01:59 deraadt Exp $	*/
+/*	$OpenBSD: setjmp.S,v 1.7 2003/06/03 01:35:30 drahn Exp $	*/
 /* kernel version of this file, does not have signal goop */
 /* int setjmp(jmp_buf env) */
 
 /*
- * Copyright (c) 1996 Dale Rahn. All rights reserved.
+ * Copyright (c) 1996 Dale Rahn.
+ * All rights reserved.
  *
  *   
  * Redistribution and use in source and binary forms, with or without
@@ -14,11 +15,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 Dale Rahn.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES