summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--share/doc/Makefile3
-rw-r--r--share/doc/smm/Makefile6
-rw-r--r--share/man/man4/Makefile7
-rw-r--r--share/man/man4/man4.arm32/Makefile11
-rw-r--r--share/man/man4/man4.arm32/asc.443
-rw-r--r--share/man/man4/man4.arm32/autoconf.467
-rw-r--r--share/man/man4/man4.arm32/beep.443
-rw-r--r--share/man/man4/man4.arm32/com.4104
-rw-r--r--share/man/man4/man4.arm32/csc.443
-rw-r--r--share/man/man4/man4.arm32/ea.456
-rw-r--r--share/man/man4/man4.arm32/eb.457
-rw-r--r--share/man/man4/man4.arm32/intro.4125
-rw-r--r--share/man/man4/man4.arm32/kbd.443
-rw-r--r--share/man/man4/man4.arm32/lpt.453
-rw-r--r--share/man/man4/man4.arm32/mainbus.444
-rw-r--r--share/man/man4/man4.arm32/mem.485
-rw-r--r--share/man/man4/man4.arm32/podulebus.444
-rw-r--r--share/man/man4/man4.arm32/quadmouse.450
-rw-r--r--share/man/man4/man4.arm32/rd.443
-rw-r--r--share/man/man4/man4.arm32/wd.445
-rw-r--r--share/man/man4/man4.i386/joy.4135
-rw-r--r--share/man/man4/man4.i386/sb.414
-rw-r--r--share/man/man4/man4.i386/speaker.413
-rw-r--r--share/man/man4/tty.427
-rw-r--r--share/man/man7/mdoc.samples.77
-rw-r--r--share/man/man8/Makefile7
-rw-r--r--share/man/man8/man8.arm32/MAKEDEV.8118
-rw-r--r--share/man/man8/man8.arm32/Makefile8
-rw-r--r--share/man/man9/disk.95
-rw-r--r--share/man/man9/inittodr.95
-rw-r--r--share/misc/inter.phone47
-rw-r--r--share/misc/style5
-rw-r--r--share/mk/bsd.README49
-rw-r--r--share/mk/bsd.obj.mk6
-rw-r--r--share/mk/bsd.own.mk10
-rw-r--r--share/mk/bsd.prog.mk8
-rw-r--r--share/mk/bsd.subdir.mk8
-rw-r--r--share/mk/sys.mk10
-rw-r--r--share/zoneinfo/datfiles/etcetera6
-rw-r--r--share/zoneinfo/datfiles/europe10
-rw-r--r--share/zoneinfo/datfiles/northamerica23
-rw-r--r--share/zoneinfo/datfiles/solar895
42 files changed, 1401 insertions, 97 deletions
diff --git a/share/doc/Makefile b/share/doc/Makefile
index a0e5bb60b1c..eeceb2579f5 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,7 +1,8 @@
+# $OpenBSD: Makefile,v 1.2 1996/04/22 01:26:37 deraadt Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
SUBDIR= psd smm usd
-all depend lint tags:
+all depend includes lint tags:
.include <bsd.subdir.mk>
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index a61bef44609..c515757374e 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.2 1996/04/22 01:26:42 deraadt Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/10/93
-# $Id: Makefile,v 1.1.1.1 1995/10/18 08:44:15 deraadt Exp $
# The following modules do not build/install:
# 10.named, 13.amd
@@ -13,8 +13,8 @@
BINDIR= /usr/share/doc/smm
FILES= 00.contents Makefile Title
SUBDIR= 01.setup 04.quotas 05.fastfs 06.nfs 18.net
-.if exists(03.fsck)
-SUBDIR+= 03.fsck
+.if exists(03.fsck_ffs)
+SUBDIR+= 03.fsck_ffs
.endif
.if exists(07.lpd)
SUBDIR+= 07.lpd
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 00a513df8ed..4722a171713 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.21 1995/12/30 18:10:47 thorpej Exp $
+# $OpenBSD: Makefile,v 1.7 1996/04/22 01:26:48 deraadt Exp $
+# $NetBSD: Makefile,v 1.22 1996/03/28 21:32:58 mark Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= audio.4 bpf.4 ccd.4 clnp.4 cltp.4 ddb.4 drum.4 esis.4 fd.4 icmp.4 \
@@ -8,7 +9,7 @@ MAN= audio.4 bpf.4 ccd.4 clnp.4 cltp.4 ddb.4 drum.4 esis.4 fd.4 icmp.4 \
MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4
MLINKS+=netintro.4 networking.4
MLINKS+=rnd.4 srnd.4 rnd.4 urnd.4 rnd.4 prnd.4
-SUBDIR= man4.amiga man4.atari man4.hp300 man4.i386 man4.mac68k man4.pc532 \
- man4.sparc man4.sun3 man4.tahoe man4.vax
+SUBDIR= man4.amiga man4.arm32 man4.atari man4.hp300 man4.i386 man4.mac68k \
+ man4.pc532 man4.sparc man4.sun3 man4.tahoe man4.vax
.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.arm32/Makefile b/share/man/man4/man4.arm32/Makefile
new file mode 100644
index 00000000000..c48d13a4269
--- /dev/null
+++ b/share/man/man4/man4.arm32/Makefile
@@ -0,0 +1,11 @@
+# $OpenBSD: Makefile,v 1.1 1996/04/22 01:27:21 deraadt Exp $
+# from: @(#)Makefile 5.1 (Berkeley) 2/12/91
+
+MAN= intro.4 asc.4 autoconf.4 beep.4 com.4
+MAN+= csc.4 ea.4 eb.4 kbd.4 lpt.4 mainbus.4 mem.4
+MAN+= podulebus.4 quadmouse.4 rd.4 wd.4
+
+MLINKS= mem.4 kmem.4
+MANSUBDIR=/arm32
+
+.include <bsd.prog.mk>
diff --git a/share/man/man4/man4.arm32/asc.4 b/share/man/man4/man4.arm32/asc.4
new file mode 100644
index 00000000000..251f0e0ac4b
--- /dev/null
+++ b/share/man/man4/man4.arm32/asc.4
@@ -0,0 +1,43 @@
+.\" $OpenBSD: asc.4,v 1.1 1996/04/22 01:27:28 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm asc
+.Nd Acorn SCSI Card device interface
+.Sh SYNOPSIS
+.Cd "asc0 at podulebus?"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to Acorn SCSI Card interfaces.
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/autoconf.4 b/share/man/man4/man4.arm32/autoconf.4
new file mode 100644
index 00000000000..8a3b4438984
--- /dev/null
+++ b/share/man/man4/man4.arm32/autoconf.4
@@ -0,0 +1,67 @@
+.\" $OpenBSD: autoconf.4,v 1.1 1996/04/22 01:27:32 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" Copyright (c) 1994 Christopher G. Demetriou
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Christopher G. Demetriou.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: autoconf.4,v 1.1 1996/04/22 01:27:32 deraadt Exp $
+.\"
+.Dd
+.Dt AUTOCONF 4 arm32
+.Os
+.Sh NAME
+.Nm autoconf
+.Nd diagnostics from the autoconfiguration code
+.Sh DESCRIPTION
+When
+.Tn NetBSD
+bootstraps it probes the innards of the machine
+on which it is running
+and locates controllers, drives, and other devices, printing out
+what it finds on the console. This procedure is driven by a system
+configuration table which is processed by
+.Xr config 8
+and compiled into each kernel.
+Devices which exist in the machine but are not configured into the
+kernel are not detected.
+.Sh DIAGNOSTICS
+.Bl -diag
+.It CPU class not configured.
+You tried to boot
+.Tn NetBSD
+on a class of
+.Tn CPU
+type which it doesn't
+(or at least this compiled version of
+.Tn NetBSD
+doesn't) understand.
+.El
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr boot 8 ,
+.Xr config 8
diff --git a/share/man/man4/man4.arm32/beep.4 b/share/man/man4/man4.arm32/beep.4
new file mode 100644
index 00000000000..49b13a6f1fb
--- /dev/null
+++ b/share/man/man4/man4.arm32/beep.4
@@ -0,0 +1,43 @@
+.\" $OpenBSD: beep.4,v 1.1 1996/04/22 01:27:34 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm beep
+.Nd Simple VIDC20 beep device interface
+.Sh SYNOPSIS
+.Cd "beep0 at mainbus? base 0x00000000"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to the simple beep device.
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/com.4 b/share/man/man4/man4.arm32/com.4
new file mode 100644
index 00000000000..2432b84fd0c
--- /dev/null
+++ b/share/man/man4/man4.arm32/com.4
@@ -0,0 +1,104 @@
+.\" $OpenBSD: com.4,v 1.1 1996/04/22 01:27:36 deraadt Exp $
+.\"
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" the Systems Programming Group of the University of Utah Computer
+.\" Science Department.
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91
+.\" $Id: com.4,v 1.1 1996/04/22 01:27:36 deraadt Exp $
+.\"
+.Dd July 28, 1995
+.Dt COM 4 arm32
+.Os NetBSD 1.0a
+.Sh NAME
+.Nm com
+.Nd
+serial communications interface
+.Sh SYNOPSIS
+.Cd "com0 at mainbus? base 0x00210fe0"
+.Cd "com1 at mainbus? base 0x00210be0"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for NS8250-, NS16450-, and NS16550-based
+.Tn EIA
+.Tn RS-232C
+.Pf ( Tn CCITT
+.Tn V.28 )
+communications interfaces. The NS8250 and NS16450 have single character
+buffers, and the NS16550 has a 16 character buffer.
+.Pp
+Input and output for each line may set to one of following baud rates;
+50, 75, 110, 134.5, 150, 300, 600, 1200, 1800, 2400, 4800, 9600,
+19200, 38400, 57600, or 115200, or any other baud rate which is a factor
+of 115200.
+.Pp
+If
+.Dq flags 1
+is specified, the
+.Nm
+driver will not set the MCR_IENABLE bit on the UART. This is mainly for
+use on AST multiport boards, where the MCR_IENABLE bit is used to control
+whether or not the devices use a shared interrupt.
+.Sh FILES
+.Bl -tag -width Pa
+.It Pa /dev/tty00
+.It Pa /dev/tty01
+.It Pa /dev/tty02
+.El
+.Sh DIAGNOSTICS
+.Bl -diag
+.It com%d: %d silo overflows
+The input
+.Dq silo
+has overflowed and incoming data has been lost.
+.It com%d: weird interrupt: iir=%x
+The device has generated an unexpected interrupt
+with the code listed.
+.El
+.Sh SEE ALSO
+.Xr tty 4
+.Sh HISTORY
+The
+.Nm
+driver was originally derived from the
+.Nm i386
+.Nm com
+driver and is
+.Ud
+.Sh BUGS
+Data loss is possible on busy systems with unbuffered UARTs at high speed.
+.Pp
+The name of this driver and the constants which define the locations
+of the various serial ports are holdovers from
+.Nm DOS .
diff --git a/share/man/man4/man4.arm32/csc.4 b/share/man/man4/man4.arm32/csc.4
new file mode 100644
index 00000000000..1d78b191a58
--- /dev/null
+++ b/share/man/man4/man4.arm32/csc.4
@@ -0,0 +1,43 @@
+.\" $OpenBSD: csc.4,v 1.1 1996/04/22 01:27:38 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm csc
+.Nd Cumana SCSI II Card device interface
+.Sh SYNOPSIS
+.Cd "csc0 at podulebus?"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to Cumana SCSI II interfaces.
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/ea.4 b/share/man/man4/man4.arm32/ea.4
new file mode 100644
index 00000000000..e77015c8b1a
--- /dev/null
+++ b/share/man/man4/man4.arm32/ea.4
@@ -0,0 +1,56 @@
+.\" $OpenBSD: ea.4,v 1.1 1996/04/22 01:27:41 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: ea.4,v 1.1 1996/04/22 01:27:41 deraadt Exp $
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm ea
+.Nd Ethernet driver for SEQ8004 based podule ethernet interfaces.
+.Sh SYNOPSIS
+.Cd "ea0 at podulebus?"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to a 10 Mb/s Ethernet network via the
+SEEQ 8004 Ethernet chip. The ethernet cards supported
+by the
+.Nm
+interface are:
+.Pp
+.Bl -tag -width -offset indent -compact
+.It ANT Ether3 podule
+.El
+.Sh SEE ALSO
+.Xr ifconfig 8 ,
+.Xr intro 4 ,
+.Xr eb 4
diff --git a/share/man/man4/man4.arm32/eb.4 b/share/man/man4/man4.arm32/eb.4
new file mode 100644
index 00000000000..6a083dfa327
--- /dev/null
+++ b/share/man/man4/man4.arm32/eb.4
@@ -0,0 +1,57 @@
+.\" $OpenBSD: eb.4,v 1.1 1996/04/22 01:27:43 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: eb.4,v 1.1 1996/04/22 01:27:43 deraadt Exp $
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm eb
+.Nd Ethernet driver for SEQ8005 based network slot ethernet interfaces.
+.Sh SYNOPSIS
+.Cd "eb0 at podulebus?"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to a 10 Mb/s Ethernet network via the
+SEEQ 8005 Ethernet chip. The ethernet cards supported
+by the
+.Nm
+interface are:
+.Pp
+.Bl -tag -width -offset indent -compact
+.It Acorn AEH61 network slot card
+.It Acorn AEH62 network slot card
+.El
+.Sh SEE ALSO
+.Xr ifconfig 8 ,
+.Xr intro 4 ,
+.Xr ea 4
diff --git a/share/man/man4/man4.arm32/intro.4 b/share/man/man4/man4.arm32/intro.4
new file mode 100644
index 00000000000..74df7d5a233
--- /dev/null
+++ b/share/man/man4/man4.arm32/intro.4
@@ -0,0 +1,125 @@
+.\" $OpenBSD: intro.4,v 1.1 1996/04/22 01:27:45 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" Copyright (c) 1994 Christopher G. Demetriou
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Christopher G. Demetriou.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: intro.4,v 1.1 1996/04/22 01:27:45 deraadt Exp $
+.\"
+.Dd
+.Dt INTRO 4 arm32
+.Os
+.Sh NAME
+.Nm intro
+.Nd introduction to special files and hardware support
+.Sh DESCRIPTION
+This section describes the special files, related driver functions,
+and networking support
+available in the system.
+In this part of the manual, the
+.Tn SYNOPSIS
+section of
+each configurable device gives a sample specification
+for use in constructing a system description for the
+.Xr config 8
+program.
+The
+.Tn DIAGNOSTICS
+section lists messages which may appear on the console
+and/or in the system error log
+.Pa /var/log/messages
+due to errors in device operation;
+see
+.Xr syslogd 8
+for more information.
+.Pp
+This section contains both devices
+which may be configured into the system
+and network related information.
+The networking support is introduced in
+.Xr netintro 4 .
+.Sh DEVICE SUPPORT
+This section describes the hardware supported on the arm32
+(RiscPC) platform.
+Software support for these devices comes in two forms. A hardware
+device may be supported with a character or block
+.Em device driver ,
+or it may be used within the networking subsystem and have a
+.Em network interface driver .
+Block and character devices are accessed through files in the file
+system of a special type; see
+.Xr mknod 8 .
+Network interfaces are indirectly accessed through the interprocess
+communication facilities provided by the system; see
+.Xr socket 2 .
+.Pp
+A hardware device is identified to the system at configuration time
+and the appropriate device or network interface driver is then compiled
+into the system. When the resultant system is booted, the
+autoconfiguration facilities in the system probe for the device
+and, if found, enable the software support for it.
+If a device does not respond at autoconfiguration
+time it is not accessible at any time afterwards.
+To enable a device which did not autoconfigure,
+the system must be rebooted.
+.Pp
+The autoconfiguration system is described in
+.Xr autoconf 4 .
+A list of the supported devices is given below.
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr autoconf 4 ,
+.Xr config 8 .
+.Sh LIST OF DEVICES
+The devices listed below are supported in this incarnation of
+the system. Devices are indicated by their functional interface.
+Not all supported devices are listed.
+.Pp
+.Bl -tag -width speaker -offset indent -compact
+.It beep
+VIDC20 beep device interface
+.It com
+NS8250-, NS16450-, and NS16550-based asynchronous serial
+communications device interface
+.It eb
+EtherB network slot device interface.
+.It quadmouse
+RiscPC quadrature mouse device interface.
+.It lpt
+Parallel port device interface
+.It mem
+Main memory interface
+.It wd
+Standard Internal RiscPC IDE deviceinterface
+.El
+.Sh HISTORY
+The
+.Tn arm32
+.Nm intro
+appeared in
+.Nx 1.0a .
diff --git a/share/man/man4/man4.arm32/kbd.4 b/share/man/man4/man4.arm32/kbd.4
new file mode 100644
index 00000000000..cfc16b39c9c
--- /dev/null
+++ b/share/man/man4/man4.arm32/kbd.4
@@ -0,0 +1,43 @@
+.\" $OpenBSD: kbd.4,v 1.1 1996/04/22 01:27:49 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm kbd
+.Nd Raw keyboard driver interface
+.Sh SYNOPSIS
+.Cd "kbd0 at mainbus? base 0x00000000"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides raw I/O to the keyboard device.
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/lpt.4 b/share/man/man4/man4.arm32/lpt.4
new file mode 100644
index 00000000000..b50d829e78d
--- /dev/null
+++ b/share/man/man4/man4.arm32/lpt.4
@@ -0,0 +1,53 @@
+.\" $OpenBSD: lpt.4,v 1.1 1996/04/22 01:27:50 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" Copyright (c) 1993 Christopher G. Demetriou
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Christopher G. Demetriou.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: lpt.4,v 1.1 1996/04/22 01:27:50 deraadt Exp $
+.\"
+.Dd July 29, 1995
+.Dt LPT 4 arm32
+.Os NetBSD 1.0a
+.Sh NAME
+.Nm lpt
+.Nd
+Parallel port driver
+.Sh SYNOPSIS
+.Cd "lpt0 at mainbus? base 0x002109e0 irq 0"
+.Sh DESCRIPTION
+This driver provides access to parallel ports. The highest bit in the minor
+number selects whether to do polling or wait for interrupts. If no IRQ is
+specified in the kernel configuration, only the polling device may be used.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /dev/lpt0
+first interrupt-driven parallel port device
+.It Pa /dev/lpa0
+first polled parallel port device
+.El
diff --git a/share/man/man4/man4.arm32/mainbus.4 b/share/man/man4/man4.arm32/mainbus.4
new file mode 100644
index 00000000000..0212369bc61
--- /dev/null
+++ b/share/man/man4/man4.arm32/mainbus.4
@@ -0,0 +1,44 @@
+.\" $OpenBSD: mainbus.4,v 1.1 1996/04/22 01:27:53 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm mainbus
+.Nd RiscPC main I/O bus device.
+.Sh SYNOPSIS
+.Cd "mainbus0 at root"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to the RiscPC main I/O bus. It is only used
+by the autoconfiguration system to location devices attached to the mainbus.
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/mem.4 b/share/man/man4/man4.arm32/mem.4
new file mode 100644
index 00000000000..f108194a0a7
--- /dev/null
+++ b/share/man/man4/man4.arm32/mem.4
@@ -0,0 +1,85 @@
+.\" $OpenBSD: mem.4,v 1.1 1996/04/22 01:27:55 deraadt Exp $
+.\"
+.\" Copyright (c) 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" from: @(#)mem.4 5.3 (Berkeley) 5/2/91
+.\" $Id: mem.4,v 1.1 1996/04/22 01:27:55 deraadt Exp $
+.\"
+.Dd July 28, 1995
+.Dt MEM 4 arm
+.Os
+.Sh NAME
+.Nm mem ,
+.Nm kmem
+.Nd memory files
+.Sh DESCRIPTION
+The special file
+.Nm /dev/mem
+is an interface to the physical memory of the computer.
+Byte offsets in this file are interpreted as physical memory addresses.
+Reading and writing this file is equivalent to reading and writing
+memory itself.
+Only offsets within the bounds of
+.Nm /dev/mem
+are allowed.
+.Pp
+Kernel virtual memory is accessed through the interface
+.Nm /dev/kmem
+in the same manner as
+.Nm /dev/mem .
+Only kernel virtual addresses that are currently mapped to memory are allowed.
+.Pp
+On
+.Tn ISA
+the
+.Tn I/O
+memory space begins at physical address 0x000a0000
+and runs to 0x00100000.
+The
+per-process data
+size
+for the current process
+is
+.Dv UPAGES
+long, and ends at virtual
+address 0xfe000000.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /dev/mem
+.It Pa /dev/kmem
+.El
+.Sh HISTORY
+The
+.Nm mem ,
+.Nm kmem
+files appeared in
+.At v6 .
diff --git a/share/man/man4/man4.arm32/podulebus.4 b/share/man/man4/man4.arm32/podulebus.4
new file mode 100644
index 00000000000..333b25986ca
--- /dev/null
+++ b/share/man/man4/man4.arm32/podulebus.4
@@ -0,0 +1,44 @@
+.\" $OpenBSD: podulebus.4,v 1.1 1996/04/22 01:27:58 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm podulebus
+.Nd RiscPC podule bus device.
+.Sh SYNOPSIS
+.Cd "podulebus0 at root"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to the RiscPC podule bus. It is only used
+by the autoconfiguration system to location devices attached to the podulebus.
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/quadmouse.4 b/share/man/man4/man4.arm32/quadmouse.4
new file mode 100644
index 00000000000..1107d37253c
--- /dev/null
+++ b/share/man/man4/man4.arm32/quadmouse.4
@@ -0,0 +1,50 @@
+.\" $OpenBSD: quadmouse.4,v 1.1 1996/04/22 01:28:00 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: quadmouse.4,v 1.1 1996/04/22 01:28:00 deraadt Exp $
+.\"
+.Dd July 29, 1995
+.Dt LMS 4 arm32
+.Os NetBSD 1.0a
+.Sh NAME
+.Nm quadmouse
+.Nd
+Quadrature mouse driver
+.Sh SYNOPSIS
+.\" XXX this is awful hackery to get it to work right... -- cgd
+.Cd "quadmouse0 at mainbus? base 0x00000000"
+.Sh DESCRIPTION
+This driver provides an interface to a IOMD quadrature mouse.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /dev/quadmouse
+first IOMD quadrature mouse
+.El
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/rd.4 b/share/man/man4/man4.arm32/rd.4
new file mode 100644
index 00000000000..9f6c0e65522
--- /dev/null
+++ b/share/man/man4/man4.arm32/rd.4
@@ -0,0 +1,43 @@
+.\" $OpenBSD: rd.4,v 1.1 1996/04/22 01:28:02 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Mark Brinicombe.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd
+.Dt EB 4 arm32
+.Os
+.Sh NAME
+.Nm rd
+.Nd Ramdisc device interface
+.Sh SYNOPSIS
+.Cd "rd0 at mainbus?"
+.Sh DESCRIPTION
+The
+.Nm
+interface provides access to the ramdisc device interface.
+.Sh SEE ALSO
diff --git a/share/man/man4/man4.arm32/wd.4 b/share/man/man4/man4.arm32/wd.4
new file mode 100644
index 00000000000..8f2c047cec7
--- /dev/null
+++ b/share/man/man4/man4.arm32/wd.4
@@ -0,0 +1,45 @@
+.\" $OpenBSD: wd.4,v 1.1 1996/04/22 01:28:04 deraadt Exp $
+.\"
+.\" Copyright (c) 1995 Mark Brinicombe
+.\" Based on man4.i386/wd.4 by James A. Jegers
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd July 29th, 1995
+.Dt WD 4 arm32
+.Os NetBSD
+.Sh NAME
+.Nm wd
+.Nd WD100x compatible hard disk driver
+.Sh SYNOPSIS
+.Cd "wdc0 at mainbus? base 0x002107c0"
+.Cd "wd* at wdc? drive ?"
+.Sh DESCRIPTION
+The
+.Nm wd
+driver supports hard disk controllers which emulate the Western
+Digital WD100x. This includes standard MFM, RLL, ESDI and IDE
+controllers.
+.Pp
+Support for extended EIDE controllers is
+.Ud .
+.Sh SEE ALSO
+.Xr intro 4
diff --git a/share/man/man4/man4.i386/joy.4 b/share/man/man4/man4.i386/joy.4
index 5b0b4cd53d1..c1caa8a9abb 100644
--- a/share/man/man4/man4.i386/joy.4
+++ b/share/man/man4/man4.i386/joy.4
@@ -1,3 +1,4 @@
+.\" $OpenBSD: joy.4,v 1.2 1996/04/22 01:28:06 deraadt Exp $
.\"
.\" Copyright (c) 1996 Matthieu Herrb
.\" All rights reserved.
@@ -27,7 +28,139 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: joy.4,v 1.1 1996/01/16 08:24:49 deraadt Exp $
+.\" $NetBSD: joy.4,v 1.2 1996/03/31 00:17:43 perry Exp $
+.\"
+.Dd January 7, 1996
+.Dt JOY 4 i386
+.Os "NetBSD 1.1A"
+.Sh NAME
+.Nm joy
+.Nd
+Games adapter driver
+.Sh SYNOPSIS
+.Cd "joy0 at isa? port 0x201"
+.Sh DESCRIPTION
+This driver provides access to the games adapter. The lower bit in the
+minor device number selects the joystick: 0 is the first joystick and
+1 is the second.
+.Pp
+The game control adapter allows up to two joysticks to be attached to
+the system. The adapter plus the driver convert the present resistive
+value to a relative joystick position. On receipt of an output signal,
+four timing circuits are started. By determining the time required for
+the circuit to time-out (a function of the resistance), the paddle
+position can be determined. The adapter could be used as a general
+purpose I/O card with four analog (resistive) inputs plus four digital
+input points.
+.Pp
+Applications may call ioctl() on a game adapter driver file descriptor
+to set and get the offsets of the two potentiometers and the maximum
+time-out value for the circuit. The
+ioctl() commands are listed in
+.Pa Aq machine/joystick.h
+and currently are:
+.Pp
+.Bl -tag -width JOY_GET_X_OFFSET -compact
+.It JOY_SETTIMEOUT
+Sets the maximum time-out for the adapter.
+.It JOY_GETTIMEOUT
+Returns the current maximum time-out.
+.It JOY_SET_X_OFFSET
+Sets an offset on X value.
+.It JOY_GET_X_OFFSET
+Returns the current X offset.
+.It JOY_SET_Y_OFFSET
+Sets an offset on Y value.
+.It JOY_GET_Y_OFFSET
+Returns the current Y offset.
+.El
+.Pp
+All this commands take an integer parameter.
+.Pp
+Read() on the file descriptor returns a
+.Fa joystick
+structure:
+.Bd -literal -offset indent
+struct joystick {
+ int x;
+ int y;
+ int b1;
+ int b2;
+};
+.Ed
+.Pp
+The fields have the following functions:
+.Bl -tag -width b1
+.It Fa x
+The current X coordinate of the joystick (or position of paddle 1)
+.It Fa y
+The current Y coordinate of the joystick (or position of paddle 2)
+.It Fa b1
+The current state of button 1
+.It Fa b2
+The current state of button 2
+.El
+.Pp
+The b1 and b2 fields in struct joystick are set to 1 if the
+corresponding button is down, 0 otherwise.
+.Pp
+The x and y coordinates are supposed to be between 0 and 255 for a
+good joystick and a good adapter. Unfortunately, because of the
+hardware hack that is used to measure the position (by measuring the
+time needed to discharge an RC circuit made from the joystick's
+potentiometer and a capacitor on the adapter), calibration
+is needed to determine exactly what values are returned for a specific
+joystick/adapter combination. Incorrect hardware can yield negative or
+> 255 values.
+.Pp
+A typical calibration procedure uses the values returned at lower
+left, center and upper right positions of the joystick to compute the
+relative position.
+.Pp
+This calibration is not part of the driver.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /dev/joy0
+first joystick
+.br
+.It Pa /dev/joy1
+second joystick
+.El
+.Sh AUTHORS
+.Pp
+Jean-Marc Zucconi wrote the FreeBSD driver. Matthieu Herrb ported it
+to NetBSD and wrote this manual page.
+
+.\"
+.\" Copyright (c) 1996 Matthieu Herrb
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by Christopher G. Demetriou.
+.\" 3. 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
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" $Id: joy.4,v 1.2 1996/04/22 01:28:06 deraadt Exp $
.\"
.Dd January 7, 1996
.Dt JOY 4 i386
diff --git a/share/man/man4/man4.i386/sb.4 b/share/man/man4/man4.i386/sb.4
index 3892ee33b19..bb24d2da1c1 100644
--- a/share/man/man4/man4.i386/sb.4
+++ b/share/man/man4/man4.i386/sb.4
@@ -1,5 +1,5 @@
-.\" $OpenBSD: sb.4,v 1.3 1996/03/29 10:16:12 niklas Exp $
-.\" $NetBSD: sb.4,v 1.3 1996/02/27 22:39:42 jtc Exp $
+.\" $OpenBSD: sb.4,v 1.4 1996/04/22 01:28:07 deraadt Exp $
+.\" $NetBSD: sb.4,v 1.4 1996/03/16 17:21:58 jtk Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -43,12 +43,12 @@
.Nd
SoundBlaster family (and compatibles) audio device driver
.Sh SYNOPSIS
-.Cd "sb0 at isa? port 0xPPP irq X drq Y"
+.Cd "sb0 at isa? port 0xPPP irq X drq Y flags Z"
.Sh DESCRIPTION
The
.Nm sb
driver provides support for the SoundBlaster, SoundBlaster Pro,
-SoundBlaster 16, and hardware register-level compatible audio cards.
+SoundBlaster 16, Jazz 16, and hardware register-level compatible audio cards.
.Pp
The SoundBlaster series are half-duplex cards, capable of 8- and 16-bit
audio sample recording and playback at rates up to 44.1kHz (depending on
@@ -63,6 +63,12 @@ jumper-selected. For the SoundBlaster 16, the IRQ and DRQ channels are
set by this driver to the values specified in the config file. The IRQ
must be selected from the set {5,7,9,10}.
.Pp
+The configuration file must use a nonzero
+.Cm flags
+specification to enable the Jazz16 support. This is to avoid potential
+conflicts with other devices when probing the Jazz 16 because it requires
+use of extra I/O ports not in the base port range.
+.Pp
.Sh BUGS
The driver has not been extensively tested on original SoundBlaster,
SoundBlaster 16, or newer cards.
diff --git a/share/man/man4/man4.i386/speaker.4 b/share/man/man4/man4.i386/speaker.4
index 6bee65c9647..63a51a968b3 100644
--- a/share/man/man4/man4.i386/speaker.4
+++ b/share/man/man4/man4.i386/speaker.4
@@ -1,3 +1,4 @@
+.\" $OpenBSD: speaker.4,v 1.2 1996/04/22 01:28:08 deraadt Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
.\" All rights reserved.
@@ -27,15 +28,15 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: speaker.4,v 1.1.1.1 1995/10/18 08:44:30 deraadt Exp $
-.\"
.Dd August 6, 1993
.Dt SPEAKER 4 i386
.Os NetBSD 0.8a
.Sh NAME
speaker \- console speaker device driver
.Sh SYNOPSIS
-.Cd "pseudo-device speaker"
+.Cd "spkr0 at pckbd? port 0x61"
+.Fd #include <machine/spkr.h>
+.Pa /dev/speaker
.Sh DESCRIPTION
The speaker device driver allows applications to control the PC console
speaker on an IBM-PC-compatible machine running UNIX.
@@ -53,7 +54,7 @@ tones. Other processes may emit beeps while the driver is running.
.Pp
Applications may call ioctl() on a speaker file descriptor to control the
speaker driver directly; definitions for the ioctl() interface are in
-machine/spkr.h. The tone_t structure used in these calls has two fields,
+<machine/spkr.h>. The tone_t structure used in these calls has two fields,
specifying a frequency (in hz) and a duration (in 1/100ths of a second).
A frequency of zero is interpreted as a rest.
.Pp
@@ -139,7 +140,9 @@ melody sections.
.Sh BUGS
Due to roundoff in the pitch tables and slop in the tone-generation and timer
hardware (neither of which was designed for precision), neither pitch accuracy
-nor timings will be mathematically exact. There is no volume control.
+nor timings will be mathematically exact.
+.Pp
+There is no volume control.
.Pp
In play strings which are very long (longer than your system's physical I/O
blocks) note suffixes or numbers may occasionally be parsed incorrectly due
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index fd903a66625..2c784e9474b 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -1,4 +1,5 @@
-.\" $NetBSD: tty.4,v 1.2 1994/11/30 16:22:40 jtc Exp $
+.\" $OpenBSD: tty.4,v 1.3 1996/04/22 01:26:49 deraadt Exp $
+.\" $NetBSD: tty.4,v 1.4 1996/03/19 04:26:01 paulus Exp $
.\"
.\" Copyright (c) 1991, 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -389,6 +390,30 @@ represent modem state as described above, however each bit which is on
in
.Fa state
is cleared in the terminal.
+.It Dv TIOCSFLAGS Fa int *state
+The bits in the integer pointed to by
+.Fa state
+contain bits that correspond to serial port state. Following is a list
+of defined variables and the serial port state they represent:
+.Pp
+.Bl -tag -width TIOCFLAG_SOFTCAR -compact
+.It TIOCFLAG_SOFTCAR
+Ignore hardware carrier.
+.It TIOCFLAG_CLOCAL
+Set clocal on open.
+.It TIOCFLAG_CRTSCTS
+Set crtscts on open.
+.It TIOCFLAG_MDMBUF
+Set mdmbuf on open.
+.El
+.Pp
+This call sets the serial port state to that represented by
+.Fa state .
+Not all serial ports may support this.
+.It Dv TIOCGFLAGS Fa int *state
+Return the current state of the serial port as represented
+above in the integer pointed to by
+.Fa state .
.El
.Sh SEE ALSO
.Xr getty 8 ,
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 8943f52868d..e5b9c1d25e2 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1,4 +1,5 @@
-.\" $NetBSD: mdoc.samples.7,v 1.4 1994/11/30 19:07:22 jtc Exp $
+.\" $OpenBSD: mdoc.samples.7,v 1.2 1996/04/22 01:28:11 deraadt Exp $
+.\" $NetBSD: mdoc.samples.7,v 1.5 1996/04/03 20:17:34 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -2747,10 +2748,10 @@ which can be set to zero in the site dependent style file
.Pa /usr/src/share/tmac/doc-nroff
to restore the old style behavior.
.Sh FILES
-.Bl -tag -width /usr/share/man0/template.doc -compact
+.Bl -tag -width /usr/share/misc/mdoc.template -compact
.It Pa /usr/share/tmac/tmac.doc
manual macro package
-.It Pa /usr/share/man0/template.doc
+.It Pa /usr/share/misc/mdoc.template
template for writing a man page
.El
.Sh SEE ALSO
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 62da3f5f6c8..32cd2146d74 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 1995/11/28 08:03:34 jtc Exp $
+# $OpenBSD: Makefile,v 1.3 1996/04/22 01:28:14 deraadt Exp $
+# $NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= adduser.8 compat_linux.8 compat_sunos.8 diskless.8 intro.8 rc.8 \
sticky.8 yp.8
-SUBDIR= man8.amiga man8.atari man8.hp300 man8.i386 man8.mac68k man8.sparc \
- man8.sun3 man8.tahoe man8.vax
+SUBDIR= man8.amiga man8.arm32 man8.atari man8.hp300 man8.i386 man8.mac68k \
+ man8.sparc man8.sun3 man8.tahoe man8.vax
.include <bsd.prog.mk>
diff --git a/share/man/man8/man8.arm32/MAKEDEV.8 b/share/man/man8/man8.arm32/MAKEDEV.8
new file mode 100644
index 00000000000..8a2d3cab7ea
--- /dev/null
+++ b/share/man/man8/man8.arm32/MAKEDEV.8
@@ -0,0 +1,118 @@
+.\" $OpenBSD: MAKEDEV.8,v 1.1 1996/04/22 01:28:16 deraadt Exp $
+.\"
+.\" Copyright (c) 1991 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" 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.
+.\" 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" from: @(#)MAKEDEV.8 5.2 (Berkeley) 3/22/91
+.\" $Id: MAKEDEV.8,v 1.1 1996/04/22 01:28:16 deraadt Exp $
+.\"
+.TH MAKEDEV 8 "March 22, 1991"
+.UC 7
+.SH NAME
+MAKEDEV \- create system and device special files
+.SH SYNOPSIS
+MAKEDEV name ...
+.SH DESCRIPTION
+The shell script
+.IR MAKEDEV ,
+found in the ``/dev'' directory, is used to create the common special
+files.
+See
+.IR special (8)
+for a more complete discussion of special files.
+.PP
+.I MAKEDEV
+takes any number of device names as arguments, where the names are
+the common abbreviation for the device.
+There are two special devices, ``std'' and ``local''.
+The former creates the standard devices for the architecture.
+The latter is for devices specific to the local site, and
+executes the shell file ``MAKEDEV.local''.
+.PP
+The arm32 supports the following devices.
+Where a device name is followed by a hash sign (``#''), the hash sign
+must be replaced by a unit number.
+.TP 10
+std
+the standard devices (console, drum, fd/*, klog, kmem, mem, null,
+stderr, stdin, stdout, tty)
+.br
+.ns
+.TP 10
+local
+configuration specific devices
+.br
+.ns
+.TP 10
+tty0#
+standard COM ports
+.br
+.ns
+.TP 10
+cd#
+SCSI CD-ROM drives
+.br
+.ns
+.TP 10
+fd#
+``floppy'' disk drives (3 1/2, 5 1/4)
+.br
+.ns
+.TP 10
+flog#
+kernel logging device
+.br
+.ns
+.TP 10
+pty#
+set of 16 master and slave pseudo terminals
+.br
+.ns
+.TP 10
+sd#
+SCSI disk drives
+.br
+.ns
+.TP 10
+st#
+SCSI tape drives
+.br
+.ns
+.TP 10
+wd#
+``winchester'' disk drives (ST506, IDE, ESDI, RLL etc.)
+.SH FILES
+/dev The special file directory.
+.SH SEE ALSO
+.IR mknod (1),
+.IR intro (4),
+.IR config (8),
+.IR special (8)
diff --git a/share/man/man8/man8.arm32/Makefile b/share/man/man8/man8.arm32/Makefile
new file mode 100644
index 00000000000..081f482b3e8
--- /dev/null
+++ b/share/man/man8/man8.arm32/Makefile
@@ -0,0 +1,8 @@
+# $OpenBSD: Makefile,v 1.1 1996/04/22 01:28:17 deraadt Exp $
+# from: @(#)Makefile 5.1 (Berkeley) 3/22/91
+
+MAN= MAKEDEV.8
+MLINKS= MAKEDEV.8 makedev.8
+MANSUBDIR=/arm32
+
+.include <bsd.prog.mk>
diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9
index 41b80b5758c..75260908a52 100644
--- a/share/man/man9/disk.9
+++ b/share/man/man9/disk.9
@@ -1,4 +1,5 @@
-.\" $NetBSD: disk.9,v 1.1 1996/01/09 00:22:04 thorpej Exp $
+.\" $OpenBSD: disk.9,v 1.2 1996/04/22 01:28:20 deraadt Exp $
+.\" $NetBSD: disk.9,v 1.2 1996/04/08 20:41:25 jtc Exp $
.\"
.\" Copyright (c) 1995, 1996 Jason R. Thorpe.
.\" All rights reserved.
@@ -248,7 +249,7 @@ foostart(sc)
/* Build command to send to drive. */
[ . . . ]
- /* Tell the disk framework we're is going busy. */
+ /* Tell the disk framework we're going busy. */
disk_busy(&sc->sc_dk);
/* Send command to the drive. */
diff --git a/share/man/man9/inittodr.9 b/share/man/man9/inittodr.9
index 403fc2bcaac..a8ef109a9d7 100644
--- a/share/man/man9/inittodr.9
+++ b/share/man/man9/inittodr.9
@@ -1,4 +1,5 @@
-.\" $NetBSD: inittodr.9,v 1.1 1995/11/25 21:24:50 perry Exp $
+.\" $OpenBSD: inittodr.9,v 1.2 1996/04/22 01:28:22 deraadt Exp $
+.\" $NetBSD: inittodr.9,v 1.2 1996/03/27 21:16:06 jtc Exp $
.\"
.\" Copyright (c) 1994 Christopher G. Demetriou
.\" All rights reserved.
@@ -51,7 +52,7 @@ Those heuristics include:
.It
If the battery-backed clock has a valid time, it is used.
.It
-If the battery-backed clock does not have a valid time, and the
+If the battery-backed clock does not have a valid time, and
the time provided in
.Fa base
is within reason,
diff --git a/share/misc/inter.phone b/share/misc/inter.phone
index 3a4330794cf..c7c6c999d5b 100644
--- a/share/misc/inter.phone
+++ b/share/misc/inter.phone
@@ -1,5 +1,7 @@
# Country Code : City Code : City : Country
-# @(#)inter.phone 5.3 (Berkeley) 3/5/90
+# $OpenBSD: inter.phone,v 1.2 1996/04/22 01:28:28 deraadt Exp $
+# $NetBSD: inter.phone,v 1.3 1996/04/07 00:53:41 neil Exp $
+# From: @(#)inter.phone 5.3 (Berkeley) 3/5/90
20:2:Cairo:Egypt, Arab Rep. of
20:3:Alexandria:Egypt, Arab Rep. of
20:66:Port Said:Egypt, Arab Rep. of
@@ -104,27 +106,28 @@
43:222:Vienna:Austria
43:316:Graz:Austria
43:5222:Innsbruck:Austria
-44:1:London, Eng.:United Kingdom
-44:203:Coventry, Eng.:United Kingdom
-44:21:Birmingham, Eng.:United Kingdom
-44:222:Cardiff, Wales:United Kingdom
-44:232:Belfast, N. Ire.:United Kingdom
-44:272:Bristol, Eng.:United Kingdom
-44:274:Bradford, Eng.:United Kingdom
-44:31:Edinburgh, Scot.:United Kingdom
-44:41:Glasgow, Scot.:United Kingdom
-44:484:Huddersfield, Eng.:United Kingdom
-44:485:Hillington, Eng.:United Kingdom
-44:51:Liverpool, Eng.:United Kingdom
-44:532:Leeds, Eng.:United Kingdom
-44:533:Leicester, Eng.:United Kingdom
-44:602:Nottingham, Eng.:United Kingdom
-44:61:Manchester, Eng.:United Kingdom
-44:682:New Castle-on-Tyne, Eng.:United Kingdom
-44:742:Sheffield, Eng.:United Kingdom
-44:752:Plymouth, Eng.:United Kingdom
-44:782:Stoke-on-Trent, Eng.:United Kingdom
-44:902:Wolverhampton, Eng.:United Kingdom
+44:171:Inner-London, Eng.:United Kingdom
+44:181:Outer-London, Eng.:United Kingdom
+44:1203:Coventry, Eng.:United Kingdom
+44:121:Birmingham, Eng.:United Kingdom
+44:1222:Cardiff, Wales:United Kingdom
+44:1232:Belfast, N. Ire.:United Kingdom
+44:1272:Bristol, Eng.:United Kingdom
+44:1274:Bradford, Eng.:United Kingdom
+44:131:Edinburgh, Scot.:United Kingdom
+44:141:Glasgow, Scot.:United Kingdom
+44:1484:Huddersfield, Eng.:United Kingdom
+44:1485:Hillington, Eng.:United Kingdom
+44:151:Liverpool, Eng.:United Kingdom
+44:1532:Leeds, Eng.:United Kingdom
+44:1533:Leicester, Eng.:United Kingdom
+44:1602:Nottingham, Eng.:United Kingdom
+44:161:Manchester, Eng.:United Kingdom
+44:191:Newcastle-upon-Tyne, Eng.:United Kingdom
+44:1742:Sheffield, Eng.:United Kingdom
+44:1752:Plymouth, Eng.:United Kingdom
+44:1782:Stoke-on-Trent, Eng.:United Kingdom
+44:1902:Wolverhampton, Eng.:United Kingdom
45:3:Copenhagen:Denmark
45:6:Aarhus:Denmark
45:8:Aalborg:Denmark
diff --git a/share/misc/style b/share/misc/style
index 49131369100..be87bc1546e 100644
--- a/share/misc/style
+++ b/share/misc/style
@@ -1,8 +1,9 @@
+/* $OpenBSD: style,v 1.2 1996/04/22 01:28:30 deraadt Exp $ */
+
/*
* Style guide for the 4BSD KNF (Kernel Normal Form).
*
* from: @(#)style 1.12 (Berkeley) 3/18/94
- * $Id: style,v 1.1.1.1 1995/10/18 08:44:44 deraadt Exp $
*/
/*
@@ -122,7 +123,7 @@ main(argc, argv)
* should be checked for accuracy. Code that cannot be reached should
* have a NOTREACHED comment.
*/
- while ((ch = getopt(argc, argv, "abn")) != EOF)
+ while ((ch = getopt(argc, argv, "abn")) != -1)
switch (ch) { /* Indent the switch. */
case 'a': /* Don't indent the case. */
aflag = 1;
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 62a73019ea9..479e128cc66 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,5 +1,5 @@
-# $OpenBSD: bsd.README,v 1.7 1996/03/05 11:12:34 mickey Exp $
-# $NetBSD: bsd.README,v 1.15 1996/01/22 22:46:06 cgd Exp $
+# $OpenBSD: bsd.README,v 1.8 1996/04/22 01:28:33 deraadt Exp $
+# $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
# @(#)bsd.README 5.1 (Berkeley) 5/11/90
This is the README file for the new make "include" files for the BSD
@@ -98,13 +98,19 @@ it exists.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-The include file <bsd.own.mk> contains the owners, groups, etc. for both
-manual pages and binaries.
+The include file <bsd.own.mk> contains source tree configuration parameters,
+such as the owners, groups, etc. for both manual pages and binaries, and
+a few global "feature configuration" parameters.
It has no targets.
-It sets the following variables, if they are not already defined (defaults
-are in brackets):
+To get system-specific configuration parameters, bsd.own.mk will try to
+include the file specified by the "MAKECONF" variable. If MAKECONF is not
+set, or no such file exists, the system make configuration file, /etc/mk.conf
+is included. These files may define any of the variables described below.
+
+bsd.own.mk sets the following variables, if they are not already defined
+(defaults are in brackets):
BSDSRCDIR The real path to the system sources, so that 'make obj'
will work correctly. [/usr/src]
@@ -167,9 +173,10 @@ COPY The flag passed to the install program to cause the binary
can either be installed with copies, or with moves using
a single knob. [-c]
-Additionally, the following variables may be set to modify the behaviour
-of the system build process (default values are in brackets along with
-comments, if set by bsd.own.mk):
+Additionally, the following variables may be set by bsd.own.mk or in a
+make configuration file to modify the behaviour of the system build
+process (default values are in brackets along with comments, if set by
+bsd.own.mk):
SKEY Compile in support for S/key authentication. [yes, set
unconditionally]
@@ -192,7 +199,7 @@ NOPIC Do not build PIC versions of system libraries, and
NOLINT Do not build lint libraries. [set, set unconditionally]
-This file is generally useful when building your own Makefiles so that
+bsd.own.mk is generally useful when building your own Makefiles so that
they use the same default owners etc. as the rest of the tree.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -201,7 +208,7 @@ The include file <bsd.prog.mk> handles building programs from one or
more source files, along with their manual pages. It has a limited number
of suffixes, consistent with the current needs of the BSD tree.
-It has seven targets:
+It has eight targets:
all:
build the program and its manual page
@@ -214,6 +221,8 @@ It has seven targets:
depend:
make the dependencies for the source files, and store
them in the file .depend.
+ includes:
+ install any header files.
install:
install the program and its manual pages; if the Makefile
does not itself define the target install, the targets
@@ -328,12 +337,12 @@ If foo has multiple source files, add the line:
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
The include file <bsd.subdir.mk> contains the default targets for building
-subdirectories. It has the same seven targets as <bsd.prog.mk>: all, clean,
-cleandir, depend, install, lint, and tags. For all of the directories
-listed in the variable SUBDIRS, the specified directory will be visited
-and the target made. There is also a default target which allows the
-command "make subdir" where subdir is any directory listed in the variable
-SUBDIRS.
+subdirectories. It has the same eight targets as <bsd.prog.mk>: all,
+clean, cleandir, depend, includes, install, lint, and tags. For all of
+the directories listed in the variable SUBDIRS, the specified directory
+will be visited and the target made. There is also a default target which
+allows the command "make subdir" where subdir is any directory listed in
+the variable SUBDIRS.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -346,9 +355,9 @@ yacc that allow multiple lex and yacc targets to be built in parallel.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
The include file <bsd.lib.mk> has support for building libraries. It has
-the same seven targets as <bsd.prog.mk>: all, clean, cleandir, depend,
-install, lint, and tags. It has a limited number of suffixes, consistent
-with the current needs of the BSD tree.
+the same eight targets as <bsd.prog.mk>: all, clean, cleandir, depend,
+includes, install, lint, and tags. It has a limited number of suffixes,
+consistent with the current needs of the BSD tree.
It sets/uses the following variables:
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 26355619366..f9074263c38 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,5 +1,5 @@
-# $OpenBSD: bsd.obj.mk,v 1.2 1996/03/05 11:12:53 mickey Exp $
-# $NetBSD: bsd.obj.mk,v 1.8 1996/02/21 10:02:00 pk Exp $
+# $OpenBSD: bsd.obj.mk,v 1.3 1996/04/22 01:28:34 deraadt Exp $
+# $NetBSD: bsd.obj.mk,v 1.9 1996/04/10 21:08:05 thorpej Exp $
.if !target(obj)
.if defined(NOOBJ)
@@ -26,7 +26,7 @@ __usrobjdirpf=
obj: _SUBDIRUSE
@cd ${.CURDIR}; rm -f ${__objdir} > /dev/null 2>&1 || true; \
- here=`pwd`; subdir=$${here#${BSDSRCDIR}/}; \
+ here=`/bin/pwd`; subdir=$${here#${BSDSRCDIR}/}; \
if test $$here != $$subdir ; then \
dest=${__usrobjdir}/$$subdir${__usrobjdirpf} ; \
echo "$$here/${__objdir} -> $$dest"; \
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index bafb7c106e6..8675e9630c5 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,5 +1,11 @@
-# $OpenBSD: bsd.own.mk,v 1.6 1996/03/05 11:12:56 mickey Exp $
-# $NetBSD: bsd.own.mk,v 1.23 1995/11/03 23:33:33 cgd Exp $
+# $OpenBSD: bsd.own.mk,v 1.7 1996/04/22 01:28:35 deraadt Exp $
+# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
+
+.if defined(MAKECONF) && exists(${MAKECONF})
+.include "${MAKECONF}"
+.elif exists(/etc/mk.conf)
+.include "/etc/mk.conf"
+.endif
# Defining `SKEY' causes support for S/key authentication to be compiled in.
SKEY= yes
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index d998a0429af..19fcddf731b 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
-# $OpenBSD: bsd.prog.mk,v 1.2 1996/03/05 11:12:59 mickey Exp $
-# $NetBSD: bsd.prog.mk,v 1.53 1995/06/25 22:29:02 cgd Exp $
+# $OpenBSD: bsd.prog.mk,v 1.3 1996/04/22 01:28:36 deraadt Exp $
+# $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
.if exists(${.CURDIR}/../Makefile.inc)
@@ -21,10 +21,10 @@ LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a
LIBDES?= ${DESTDIR}/usr/lib/libdes.a
LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a
LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a
-LIBL?= ${DESTDIR}/usr/lib/libl.a
LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a
LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a
LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a
+LIBL?= ${DESTDIR}/usr/lib/libl.a
LIBM?= ${DESTDIR}/usr/lib/libm.a
LIBMP?= ${DESTDIR}/usr/lib/libmp.a
LIBPC?= ${DESTDIR}/usr/lib/libpc.a
@@ -34,6 +34,7 @@ LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a
LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a
LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a
LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a
+LIBY?= ${DESTDIR}/usr/lib/liby.a
.if defined(SHAREDSTRINGS)
CLEANFILES+=strings
@@ -149,3 +150,4 @@ lint: ${LOBJS}
.include <bsd.obj.mk>
.include <bsd.dep.mk>
.include <bsd.subdir.mk>
+.include <bsd.sys.mk>
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 3e531fc8453..4ae786aa282 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
-# $OpenBSD: bsd.subdir.mk,v 1.6 1996/03/16 05:32:40 etheisen Exp $
-# $NetBSD: bsd.subdir.mk,v 1.10 1995/07/24 04:22:29 cgd Exp $
+# $OpenBSD: bsd.subdir.mk,v 1.7 1996/04/22 01:28:37 deraadt Exp $
+# $NetBSD: bsd.subdir.mk,v 1.11 1996/04/04 02:05:06 jtc Exp $
# @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
.if !target(.MAIN)
@@ -69,6 +69,10 @@ clean: _SUBDIRUSE
cleandir: _SUBDIRUSE
.endif
+.if !target(includes)
+includes: _SUBDIRUSE
+.endif
+
.if !target(depend)
depend: _SUBDIRUSE
.endif
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 7447c829928..5df009427b7 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
-# $OpenBSD: sys.mk,v 1.6 1996/03/29 10:17:55 niklas Exp $
-# $NetBSD: sys.mk,v 1.25 1996/02/29 19:06:57 jtc Exp $
+# $OpenBSD: sys.mk,v 1.7 1996/04/22 01:28:38 deraadt Exp $
+# $NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
# @(#)sys.mk 5.11 (Berkeley) 3/13/91
unix= We run OpenBSD.
@@ -14,7 +14,7 @@ RANLIB?= ranlib
AS?= as
AFLAGS?=
-COMPILE.s?= ${AS} ${AFLAGS}
+COMPILE.s?= ${CC} ${AFLAGS} -c
LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c
LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
@@ -142,7 +142,7 @@ YACC.y?= ${YACC} ${YFLAGS}
.s:
${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.s.o:
- ${COMPILE.s} -o ${.TARGET} ${.IMPSRC}
+ ${COMPILE.s} ${.IMPSRC}
.s.a:
${COMPILE.s} ${.IMPSRC}
${AR} ${ARFLAGS} $@ $*.o
@@ -150,7 +150,7 @@ YACC.y?= ${YACC} ${YFLAGS}
.S:
${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.S.o:
- ${COMPILE.S} -o ${.TARGET} ${.IMPSRC}
+ ${COMPILE.S} ${.IMPSRC}
.S.a:
${COMPILE.S} ${.IMPSRC}
${AR} ${ARFLAGS} $@ $*.o
diff --git a/share/zoneinfo/datfiles/etcetera b/share/zoneinfo/datfiles/etcetera
index ed619aecfaa..8bc9a204422 100644
--- a/share/zoneinfo/datfiles/etcetera
+++ b/share/zoneinfo/datfiles/etcetera
@@ -1,4 +1,5 @@
-# @(#)etcetera 7.4
+# $OpenBSD: etcetera,v 1.2 1996/04/22 01:28:45 deraadt Exp $
+# @(#)etcetera 7.5
# All of these are set up just so people can "zic -l" to a timezone
# that's right for their area, even if it doesn't have a name or DST rules
@@ -27,7 +28,8 @@ Link Etc/GMT Etc/GMT0
# zic -l GMT-12
# so we moved the names into the Etc subdirectory.
-Zone Etc/GMT-13 13 - GMT-13 # 12 hours ahead of GMT, plus DST
+Zone Etc/GMT-14 14 - GMT-14 # 14 hours ahead of GMT
+Zone Etc/GMT-13 13 - GMT-13
Zone Etc/GMT-12 12 - GMT-12
Zone Etc/GMT-11 11 - GMT-11
Zone Etc/GMT-10 10 - GMT-10
diff --git a/share/zoneinfo/datfiles/europe b/share/zoneinfo/datfiles/europe
index 85c05eef114..7ab9b78a149 100644
--- a/share/zoneinfo/datfiles/europe
+++ b/share/zoneinfo/datfiles/europe
@@ -1,4 +1,5 @@
-# @(#)europe 7.31
+# $OpenBSD: europe,v 1.3 1996/04/22 01:28:53 deraadt Exp $
+# @(#)europe 7.33
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -1644,7 +1645,12 @@ Zone Europe/Lisbon -0:36:32 - LMT 1884
# From Rui Pedro Salgueiro <rps@inescca.inescc.pt> (November 12, 1992):
# Portugal has recently (September, 27) changed timezone
# (from WET to MET or CET) to harmonize with EEC.
- 1:00 EC MET%s
+ 1:00 EC MET%s 1996 Mar 31 1:00u
+# Martin Bruckmann <martin@ua.pt> (1996-02-29) reports via Peter Ilieve
+# that Portugal is reverting to 0:00 by not moving its clocks this spring.
+# The new Prime Minister was fed up with getting up in the dark in the winter.
+ 0:00 1:00 "WET DST" 1996 Oct 27 1:00u
+ 0:00 EC WET%s
# We don't know what happened to Madeira or the Azores,
# so we'll just use Shanks for now.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff --git a/share/zoneinfo/datfiles/northamerica b/share/zoneinfo/datfiles/northamerica
index c62699fcb9d..3b2405136b0 100644
--- a/share/zoneinfo/datfiles/northamerica
+++ b/share/zoneinfo/datfiles/northamerica
@@ -1,4 +1,5 @@
-# @(#)northamerica 7.21
+# $OpenBSD: northamerica,v 1.3 1996/04/22 01:28:57 deraadt Exp $
+# @(#)northamerica 7.22
# also includes Central America and the Caribbean
# This data is by no means authoritative; if you think you know better,
@@ -852,6 +853,15 @@ Zone America/Whitehorse -9:00:12 - LMT 1900 Aug 20
# Shanks also says there are four zones, but disagrees about the fourth.
# Instead of GMT-6 with DST, he says there's GMT-8 without DST.
+# From Paul Eggert (1996-02-07):
+# Today in news:4f90v4$g6g@news.internet.com.mx, Kevin Pitts
+# <bravo2@internet.com.mx> wrote that Mexico will use Horario de Verano (DST)
+# starting this year with the same rules as the US, and gave FIDE as a source.
+# (FIDE is a private organization that promotes efficient electrical use.)
+# On 1996-02-02 Mario Camou wrote that the transition times are Apr Sun>=1
+# 0:00 and Nov 1 0:00 but also wrote ``The DST-out date looks a bit fishy''.
+# Go with Pitts after 1996, and with Shanks before that.
+
# From Shanks (1991):
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mexico 1922 only - Jan 1 0:00 0 S
@@ -863,6 +873,9 @@ Rule Mexico 1943 only - Dec 16 0:00 1:00 D
Rule Mexico 1944 only - May 1 0:00 0 S
Rule Mexico 1950 only - Feb 12 0:00 1:00 D
Rule Mexico 1950 only - Jul 30 0:00 0 S
+Rule Mexico 1996 max - Apr Sun>=1 2:00 1:00 D
+Rule Mexico 1996 max - Oct lastSun 2:00 0 S
+#
Rule BajaN 1950 1966 - Apr lastSun 2:00 1:00 D
Rule BajaN 1950 1961 - Sep lastSun 2:00 0 S
Rule BajaN 1961 1966 - Oct lastSun 2:00 0 S
@@ -883,20 +896,22 @@ Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
-6:00 - CST 1942 Apr
-7:00 - MST 1949 Jan 14
-8:00 - PST 1970
- -7:00 - MST
+ -7:00 Mexico M%sT
Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
-8:00 - PST 1927 Jun 10 23:00
-7:00 - MST 1930 Nov 16
-8:00 - PST 1942 Apr
-7:00 - MST 1949 Jan 14
-8:00 BajaN P%sT 1967 Apr lastSun 2:00
- -8:00 US P%sT
+ -8:00 US P%sT 1996
+ -8:00 Mexico P%sT
Zone America/Ensenada -7:46:28 - LMT 1922 Jan 1 0:13:32
-8:00 - PST 1927 Jun 10 23:00
-7:00 - MST 1930 Nov 16
-8:00 - PST 1942 Apr
-7:00 - MST 1949 Jan 14
- -8:00 - PST
+ -8:00 - PST 1996
+ -8:00 Mexico P%sT
#
# Revillagigedo Is
# no information
diff --git a/share/zoneinfo/datfiles/solar89 b/share/zoneinfo/datfiles/solar89
index 5a720a8dfde..601fdc60809 100644
--- a/share/zoneinfo/datfiles/solar89
+++ b/share/zoneinfo/datfiles/solar89
@@ -1,4 +1,5 @@
-# @(#)solar89 7.3
+# $OpenBSD: solar89,v 1.3 1996/04/22 01:29:00 deraadt Exp $
+# @(#)solar89 7.4
# Apparent noon times below are for Riyadh; they're a bit off for other places.
# Times were computed using a formula provided by the U. S. Naval Observatory:
@@ -390,4 +391,4 @@ Zone Asia/Riyadh89 3:07:04 - ?? 1989
3:07:04 sol89 ?? 1990
3:07:04 - ??
# For backward compatibility...
-Link Asia/Riyadh88 Mideast/Riyadh88
+Link Asia/Riyadh89 Mideast/Riyadh89