11 files changed, 12 insertions, 78 deletions
diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h
index 643537699f9..42805d9b91c 100644
--- a/sys/arch/macppc/include/autoconf.h
+++ b/sys/arch/macppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.4 2002/03/14 03:15:55 millert Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.5 2003/06/09 16:34:21 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -11,12 +11,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 for RTMX inc
- *      by Per Fogelstrom, Opsycon AB.
- * 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/pci/mpc106reg.h b/sys/arch/macppc/pci/mpc106reg.h
index 8524c1ef4d8..76aeacd1ef8 100644
--- a/sys/arch/macppc/pci/mpc106reg.h
+++ b/sys/arch/macppc/pci/mpc106reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpc106reg.h,v 1.1 2001/09/01 15:55:17 drahn Exp $ */
+/*	$OpenBSD: mpc106reg.h,v 1.2 2003/06/09 16:34:21 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -11,12 +11,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 for RTMX Inc
- *	by Per Fogelstrom, Opsycon AB.
- * 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/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index 3a62df909ef..8a6bedd0602 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibus.c,v 1.19 2003/05/07 22:33:30 deraadt Exp $ */
+/*	$OpenBSD: mpcpcibus.c,v 1.20 2003/06/09 16:34:21 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -11,12 +11,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 for RTMX Inc
- *      by Per Fogelstrom, Opsycon AB.
- * 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/mvmeppc/include/autoconf.h b/sys/arch/mvmeppc/include/autoconf.h
index 782fb955262..845ff8e9339 100644
--- a/sys/arch/mvmeppc/include/autoconf.h
+++ b/sys/arch/mvmeppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.3 2002/03/14 03:15:58 millert Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.4 2003/06/09 16:34:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -11,12 +11,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 for RTMX inc
- *      by Per Fogelstrom, Opsycon AB.
- * 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/mvmeppc/pci/pcibrvar.h b/sys/arch/mvmeppc/pci/pcibrvar.h
index e3222f70272..97df34eaac1 100644
--- a/sys/arch/mvmeppc/pci/pcibrvar.h
+++ b/sys/arch/mvmeppc/pci/pcibrvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibrvar.h,v 1.1 2001/06/26 21:57:57 smurph Exp $ */
+/*	$OpenBSD: pcibrvar.h,v 1.2 2003/06/09 16:34:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -11,12 +11,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
- *	Per Fogelstrom.
- * 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/powerpc/include/elf_abi.h b/sys/arch/powerpc/include/elf_abi.h
index 69246bbbff9..ac2560ae1b7 100644
--- a/sys/arch/powerpc/include/elf_abi.h
+++ b/sys/arch/powerpc/include/elf_abi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elf_abi.h,v 1.3 2002/09/15 09:01:59 deraadt Exp $ */
+/*	$OpenBSD: elf_abi.h,v 1.4 2003/06/09 16:34:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -11,12 +11,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
- *	Per Fogelstrom.
- * 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/powerpc/include/exec.h b/sys/arch/powerpc/include/exec.h
index 893605087ef..8b56f51ebbf 100644
--- a/sys/arch/powerpc/include/exec.h
+++ b/sys/arch/powerpc/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.9 2002/09/15 09:01:59 deraadt Exp $ */
+/*	$OpenBSD: exec.h,v 1.10 2003/06/09 16:34:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB.
@@ -11,12 +11,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 for RTMX Inc,
- *	North Carolina, USA, by	Per Fogelstrom, Opsycon AB, Sweden.
- * 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
@@ -30,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exec.h,v 1.9 2002/09/15 09:01:59 deraadt Exp $
+ *	$Id: exec.h,v 1.10 2003/06/09 16:34:22 deraadt Exp $
  */
 
 #ifndef _POWERPC_EXEC_H_
diff --git a/sys/dev/ic/dp857xreg.h b/sys/dev/ic/dp857xreg.h
index 87c985d8973..dec66d0e39c 100644
--- a/sys/dev/ic/dp857xreg.h
+++ b/sys/dev/ic/dp857xreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp857xreg.h,v 1.2 2002/03/14 01:26:54 millert Exp $ */
+/*	$OpenBSD: dp857xreg.h,v 1.3 2003/06/09 16:34:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -11,12 +11,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
- *	Per Fogelstrom.
- * 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/dev/ic/z8536reg.h b/sys/dev/ic/z8536reg.h
index 55a286ea67e..bada648745e 100644
--- a/sys/dev/ic/z8536reg.h
+++ b/sys/dev/ic/z8536reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8536reg.h,v 1.1 1997/04/10 17:13:53 pefo Exp $ */
+/*	$OpenBSD: z8536reg.h,v 1.2 2003/06/09 16:34:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -11,12 +11,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
- *	Per Fogelstrom.
- * 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/usr.bin/elf2aout/elf2aout.1 b/usr.bin/elf2aout/elf2aout.1
index 420db7988b2..243176477a8 100644
--- a/usr.bin/elf2aout/elf2aout.1
+++ b/usr.bin/elf2aout/elf2aout.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: elf2aout.1,v 1.8 2003/04/01 12:46:34 jmc Exp $
+.\"	$OpenBSD: elf2aout.1,v 1.9 2003/06/09 16:34:22 deraadt Exp $
 .\"
 .\" Copyright (c) 1996 Per Fogelstrom
 .\"
@@ -10,12 +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 under OpenBSD by
-.\"	Per Fogelstrom.
-.\" 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/usr.bin/elf2ecoff/elf2ecoff.1 b/usr.bin/elf2ecoff/elf2ecoff.1
index e97301c0c05..117cb3cc501 100644
--- a/usr.bin/elf2ecoff/elf2ecoff.1
+++ b/usr.bin/elf2ecoff/elf2ecoff.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: elf2ecoff.1,v 1.8 2003/04/01 12:46:34 jmc Exp $
+.\"	$OpenBSD: elf2ecoff.1,v 1.9 2003/06/09 16:34:22 deraadt Exp $
 .\"
 .\" Copyright (c) 1996 Per Fogelstrom
 .\"
@@ -10,12 +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 under OpenBSD by
-.\"	Per Fogelstrom.
-.\" 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