10 files changed, 154 insertions, 178 deletions

diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile
index 1a7abb0768afd..f7ffbcde15111 100644
--- a/gnu/lib/libmp/Makefile
+++ b/gnu/lib/libmp/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.6 1996/10/20 09:29:39 markm Exp $
+# $Id: Makefile,v 1.7 1996/10/24 18:03:53 markm Exp $
 #
 
 LIB=	mp
@@ -9,7 +9,7 @@ GMPDIR=	${.CURDIR}/../../../contrib/libgmp
 	${GMPDIR}/mpbsd
 
 CFLAGS+=	-I${GMPDIR} -I${GMPDIR}/mpn/generic -I${GMPDIR}/mpn/x86 \
-		-I${GMPDIR}/mpz -DBROKEN_ALIGN
+		-I${GMPDIR}/mpz -DBROKEN_ALIGN -DBERKELEY_MP
 
 MPN_SRC_C=	inlines.c cmp.c divmod_1.c divrem.c divrem_1.c dump.c \
 		mod_1.c mul.c mul_n.c random2.c sqrtrem.c get_str.c set_str.c \
@@ -21,7 +21,7 @@ MPN_SRC_ASM=	add_n.S addmul_1.S lshift.S mul_1.S rshift.S sub_n.S submul_1.S
 MPN_SRCS=	${MPN_SRC_C} ${MPN_SRC_ASM}
 
 MPBSD_LINKS=	mpz/add.c mpz/cmp.c mpz/gcd.c mpz/mul.c mpz/pow_ui.c \
-		mpz/powm.c mpz/sqrtrem.c mpz/sub.c
+		mpz/powm.c mpz/sqrtrem.c mpz/sub.c mpz/realloc.c
 MPBSD_SRCS=	itom.c mdiv.c mfree.c min.c mout.c move.c mtox.c sdiv.c xtom.c \
 		realloc.c $(MPBSD_LINKS)
 
diff --git a/gnu/usr.bin/man/apropos/apropos.man b/gnu/usr.bin/man/apropos/apropos.man
index 9fa779b55022a..8cac9a911718b 100644
--- a/gnu/usr.bin/man/apropos/apropos.man
+++ b/gnu/usr.bin/man/apropos/apropos.man
@@ -12,25 +12,29 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.TH apropos 1 "Jan 15, 1991"
-.LO 1
-.SH NAME
-apropos, whatis \- search the whatis database
-.SH SYNOPSIS
-.BI apropos
-keyword ...
-
-.BI whatis
-keyword ...
-.SH DESCRIPTION
-.B apropos 
+.Dd Jan 15, 1991
+.Dt APROPOS 1
+.Os
+.Sh NAME
+.Nm apropos , whatis
+.Nd search the whatis database
+.Sh SYNOPSIS
+.Nm apropos
+.Ar keyword ...
+.br
+.Nm whatis
+.Ar keyword ...
+.Sh DESCRIPTION
+.Nm apropos 
 searches a set of database files containing short descriptions
 of system commands for keywords and displays the result on the
 standard output.
-.B whatis
-display only complete word matches. 
+.Nm whatis
+displays only complete word matches. 
+.Sh RETURN VALUES
 The 
-.B apropos
+.Nm apropos
 utility exits 0 on success, and 1 if no keyword matched.
-.SH "SEE ALSO"
-man(1), makewhatis(1).
+.Sh SEE ALSO
+.Xr man 1 ,
+.Xr makewhatis 1
diff --git a/gnu/usr.bin/man/catman/catman.1 b/gnu/usr.bin/man/catman/catman.1
index 23d1dd03f7df3..a0a72197758e5 100644
--- a/gnu/usr.bin/man/catman/catman.1
+++ b/gnu/usr.bin/man/catman/catman.1
@@ -24,15 +24,13 @@
 .\"
 .\" /usr/bin/catman - preformat man pages
 .\"
-.\" $Id: catman.1,v 1.7 1996/01/23 21:27:39 joerg Exp $
-
+.\" $Id: catman.1,v 1.9 1996/12/09 07:25:41 mpp Exp $
 .Dd Mar 12, 1995
 .Dt CATMAN 1
 .Os
 .Sh NAME
 .Nm catman
 .Nd preformat man pages
-
 .Sh SYNOPSIS
 .Nm catman
 .Op Fl f | Fl force
@@ -41,7 +39,6 @@
 .Op Fl r | Fl remove
 .Op Fl v | Fl verbose
 .Op Ar directories...
-
 .Sh DESCRIPTION 
 .Nm Catman
 format man pages to ASCII.  It's like typing
@@ -56,29 +53,21 @@ Use
 if no 
 .Ar directories
 defined.
-
 .Sh OPTIONS
 .Bl -tag -width Ds
-
 .It Fl f , Fl force
 Force overwriting old cat pages.  Normally only those pages will be formatted
 which are not up to date.  This option is a waste of time, CPU and RAM.
-
 .It Fl h , Fl help
 Print options and exit.
-
 .It Fl p , Fl print
 Don't actually format man pages. Show what would be done.
-
 .It Fl r , Fl remove
 Remove garbage, e.\& g. catpage without manpage, uncompressed catpage but
 a compressed catpage exist, filenames with non-alphanumeric
 characters, uncompressed manpage but a compressed manpage exist.
-
 .It Fl v , Fl verbose
 More warnings.
-
-
 .Sh EXAMPLES
 .Pp
 .Dl $ catman
@@ -86,12 +75,10 @@ More warnings.
 Format man pages in
 .Ar /usr/share/man
 if neccessary.
-
 .Pp
 .Dl $ catman $MANPATH
 .Pp
 Format all your man pages if neccessary.
-
 .Pp
 .Dl $ catman -f /usr/local/man/man1 /usr/local/man/manl
 .Pp
@@ -99,25 +86,21 @@ Force reformatting of all man pages in
 .Pa /usr/local/man/man1
 and
 .Pa /usr/local/man/manl .
-
 .Pp
 .Dl $ catman -p /usr/X11/man
 .Pp
 Show only.
-
 .Sh FILES
-.Bl -tag -width /etc/master.passwdxx -compact
-.Pa /etc/weekly :
-start this program
+.Bl -tag -width /etc/weeklyxxx -compact
+.Pa /etc/weekly
+Starts this program
 .Po
 or
 .Pa /etc/daily
 .Pc
 .El
-
 .Sh FEATURES
 Very fast if all man pages already formatted.
-
 Does not support the
 .Fl w
 option as some other systems do.  Use
@@ -130,23 +113,20 @@ database.
 is a setuid program.  Be careful that user
 .Sq man
 has write permissions to the catman directories.
-
 .Nm Catman
 does not check for any
 .Sq .so
 in man page sources.  Use hard or symlinks
 to avoid redundant formatted man pages.
-
 .Sh SEE ALSO
 .Xr man 1 ,
 .Xr manpath 1 ,
 .Xr makewhatis 1 .
-
 .Sh HISTORY
 This version of
 .Nm catman
-command appeared in FreeBSD 2.1
-
+command appeared in
+.Fx 2.1 .
 .Sh AUTHOR
 Wolfram Schneider
 .Aq wosch@FreeBSD.org ,
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1
index 27922ab22079a..fe989d457ed2d 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.1
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.1
@@ -22,16 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.1,v 1.5 1996/07/08 20:18:28 wosch Exp $
-
-
+.\" $Id: makewhatis.1,v 1.7 1996/12/09 07:26:01 mpp Exp $
 .Dd Jan, 12, 1995
 .Dt MAKEWHATIS 1
 .Os FreeBSD 2.1
 .Sh NAME
 .Nm makewhatis
 .Nd create whatis database
-
 .Sh SYNOPSIS
 .Nm
 .Op Fl a | Fl append
@@ -41,7 +38,6 @@
 .Op Fl o | Fl outfile Ar file
 .Op Fl v | Fl verbose
 .Op Ar directories ...
-
 .Sh DESCRIPTION 
 .Nm
 extracts the name and a short description from unformatted manpages
@@ -50,7 +46,6 @@ and creates the
 database. 
 .Nm
 can read gzip'ed manpages.
-
 .Ar Directory
 names a directory containing manpage subdirectories
 .Pq named Pa man.+ .
@@ -59,7 +54,6 @@ Colons are treated as spaces, hence
 or
 .Ic makewhatis `manpath`
 are allowed.
-
 .Sh OPTIONS
 .Bl -tag -width Ds
 .It Fl a , Fl append
@@ -67,26 +61,21 @@ Append mode. Don't delete old entries in whatis database. Note:
 the new database will be sorted without repeated lines and
 .Nm
 does not check if old entries are valid.
-
 .It Fl h , Fl help
 Print options and exit.
-
 .It Fl i , Fl indent Ar column
 Justify description strings to
 .Ar column Pq default 24 .
-
 .It Fl n , Fl name Ar name
 Use
 .Ar name
 instead of
 .Pa whatis Ns .
-
 .It Fl o , Fl outfile Ar file
 Write all output to
 .Ar file
 instead of
 .Pa dirname/whatis Ns .
-
 .It Fl v, Fl verbose
 Issue more warnings
 .Pq to stderr .
@@ -98,8 +87,6 @@ for a compressed page, and
 .Ql +
 for a link.
 .El
-
-
 .Sh EXAMPLES
 .Pp
 .Ic makewhatis $MANPATH
@@ -127,7 +114,6 @@ Create whatis database
 instead of
 .Pa whatis Ns .
 May be useful for Solaris.
-
 .Sh FILES
 .Bl -tag -width /etc/master.passwdxx -compact
 .It Pa */man/whatis
@@ -137,7 +123,6 @@ run
 .Nm makewhatis.local
 every week
 .El
-
 .Sh SEE ALSO
 .Xr apropos 1 ,
 .Xr catman 1 ,
@@ -148,11 +133,10 @@ every week
 .Xr sort 1 ,
 .Xr uniq 1 ,
 .Xr whatis 1 .
-
 .Sh HISTORY
 This
 .Nm
-command appeared in FreeBSD 2.1.
-
+command appeared in
+.Fx 2.1 .
 .Sh AUTHOR
 Wolfram Schneider, Berlin.
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.8 b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
index ac7545061ca32..932d31d27765f 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.local.8
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
@@ -22,16 +22,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.local.8,v 1.1 1996/05/22 00:57:40 wosch Exp $
-
+.\" $Id: makewhatis.local.8,v 1.3 1996/12/09 07:26:04 mpp Exp $
 .Dd April, 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os FreeBSD 2.2
-
 .Sh NAME
 .Nm makewhatis.local , catman.local
 .Nd start makewhatis for local file systems
-
 .Sh SYNOPSIS
 .Nm /usr/libexec/makewhatis.local
 .Op options
@@ -39,8 +36,6 @@
 .Nm /usr/libexec/catman.local
 .Op options
 .Ar directories ...
-
-
 .Sh DESCRIPTION 
 .Nm
 start 
@@ -55,8 +50,7 @@ for rw nfs-mounted /usr may kill
 your NFS server -- all NFS clients start makewhatis at the same time!
 So use this wrapper for 
 .Xr cron 8
-instead calling makewhatis directly.
-
+instead of calling makewhatis directly.
 .Sh FILES
 .Bl -tag -width /etc/weekly.XXX -compact
 .It Pa /etc/weekly 
@@ -64,14 +58,13 @@ run
 .Nm
 every week
 .El
-
 .Sh SEE ALSO
-.Xr makewhatis 1 ,
 .Xr catman 1 ,
 .Xr find 1 ,
+.Xr makewhatis 1 ,
 .Xr cron 8 .
-
 .Sh HISTORY
 The
 .Nm
-command appeared in FreeBSD 2.2.
+command appeared in
+.Fx 2.2 .
diff --git a/gnu/usr.bin/man/man/man.man b/gnu/usr.bin/man/man/man.man
index 7556c58d30743..d16a59a45fc5f 100644
--- a/gnu/usr.bin/man/man/man.man
+++ b/gnu/usr.bin/man/man/man.man
@@ -12,16 +12,29 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.TH man 1 "Jan 5, 1991"
-.LO 1
-.SH NAME
-man \- format and display the on-line manual pages
-.SH SYNOPSIS
-man [\-adfhktw] [\-m system] [\-p string] [\-M path] [\-P pager]
-[\-S list] [section] name ...
-.SH DESCRIPTION
-man formats and displays the on-line manual pages.  This version knows
-about the MANPATH and PAGER environment variables, so you can have
+.Dd Jan 5, 1991
+.Dt MAN 1
+.Sh NAME
+.Nm man
+.Nd format and display the on-line manual pages
+.Sh SYNOPSIS
+.Nm man
+.Op Fl adfhktw
+.Op Fl m Ar system
+.Op Fl p Ar string
+.Op Fl M Ar path
+.Op Fl P Ar pager
+.Op Fl S Ar list
+.Op Ar section
+.Ar name ...
+.Sh DESCRIPTION
+.Nm Man
+formats and displays the on-line manual pages.  This version knows
+about the
+.Ev MANPATH
+and
+.Ev PAGER
+environment variables, so you can have
 your own set(s) of personal man pages and choose whatever program you
 like to display the formatted pages.  If section is specified, man
 only looks in that section of the manual.  You may also specify the
@@ -30,105 +43,97 @@ run on the source files via command line options or environment
 variables.  If enabled by the system administrator, formatted man
 pages will also be compressed with the `%compress%' command to save
 space.
-.SH OPTIONS
-.TP
-.B \-\^M " path"
+.Pp
+The options are as follows:
+.Bl -tag -width Fl
+.It Fl M Ar path
 Specify an alternate manpath.  By default, man uses
-.B manpath
+.Nm manpath
 to determine the path to search.  This option overrides the
-.B MANPATH
+.Ev MANPATH
 environment variable.
-.TP
-.B \-\^P " pager"
+.It Fl P Ar pager
 Specify which pager to use.  By default, man uses
-.B %pager%,
+.Nm %pager% ,
 This option overrides the
-.B PAGER
+.Ev PAGER
 environment variable.
-.TP
-.B \-\^S " list"
+.It Fl S Ar list
 List is a colon separated list of manual sections to search.
 This option overrides the
-.B MANSECT
+.Ev MANSECT
 environment variable.
-.TP
-.B \-\^a
+.It Fl a
 By default, man will exit after displaying the first manual page it
 finds.  Using this option forces man to display all the manual pages
 that match
-.B name, 
-not just the first.  
-.TP
-.B \-\^d
+.Ar name ,
+not just the first.
+.It Fl d
 Don't actually display the man pages, but do print gobs of debugging
 information.
-.TP
-.B \-\^f
+.It Fl f
 Equivalent to
-.B whatis.
-.TP
-.B \-\^h
+.Nm whatis .
+.It Fl h
 Print a one line help message and exit.
-.TP
-.B \-\^k
+.It Fl k
 Equivalent to
-.B apropos.
-.TP
-.B \-\^m " system"
+.Nm apropos .
+.It Fl m Ar system
 Specify an alternate set of man pages to search based on the system
 name given.
-.TP
-.B \-\^p " string"
+.It Fl p Ar string
 Specify the sequence of preprocessors to run before nroff or troff.
 Not all installations will have a full set of preprocessors.
 Some of the preprocessors and the letters used to designate them are: 
 eqn (e), grap (g), pic (p), tbl (t), vgrind (v), refer (r).
 This option overrides the
-.B MANROFFSEQ
+.Ev MANROFFSEQ
 environment variable.
-.TP
-.B \-\^t
+.It Fl t
 Use
-.B %troff%
-to format the manual page, passing the output to 
-.B stdout.
+.Nm %troff%
+to format the manual page, passing the output to stdout.
 The output from
-.B %troff%
+.Nm %troff%
 may need to be passed through some filter or another before being
 printed.
-.TP
-.B \-\^w
+.It Fl w
 Don't actually display the man pages, but do print the location(s) of
 the files that would be formatted or displayed.
-.SH ENVIRONMENT
-.TP \w'MANROFFSEQ\ \ 'u
-.B MANPATH
+.El
+.Sh ENVIRONMENT
+.Bl -tag -width MANROFFSEQ -compact
+.It Ev MANPATH
 If
-.B MANPATH
+.Ev MANPATH
 is set, its value is used as the path to search for manual pages.
-.TP
-.B MANROFFSEQ
+.It Ev MANROFFSEQ
 If
-.B MANROFFSEQ
+.Ev MANROFFSEQ
 is set, its value is used to determine the set of preprocessors run
 before running nroff or troff.  By default, pages are passed through
 the table preprocessor before nroff.
-.TP
-.B MANSEC
+.It Ev MANSEC
 If
-.B MANSEC
+.Ev MANSEC
 is set, its value is used to determine which manual sections to search.
-.TP
-.B PAGER
+.It Ev PAGER
 If
-.B PAGER
+.Ev PAGER
 is set, its value is used as the name of the program to use to display
 the man page.  By default,
-.B %pager%
+.Nm %pager%
 is used.
-.SH "SEE ALSO"
-apropos(1), whatis(1), manpath(1), more(1), groff(1).
-.SH BUGS
+.El
+.Sh SEE ALSO
+.Xr apropos 1 ,
+.Xr whatis 1 ,
+.Xr manpath 1 ,
+.Xr more 1 ,
+.Xr groff 1
+.Sh BUGS
 The
-.B \-t
+.Fl t
 option only works if a troff-like program is installed.
diff --git a/gnu/usr.bin/man/manpath/manpath.config b/gnu/usr.bin/man/manpath/manpath.config
index 91aac298531e1..64be439805607 100644
--- a/gnu/usr.bin/man/manpath/manpath.config
+++ b/gnu/usr.bin/man/manpath/manpath.config
@@ -23,8 +23,6 @@ MANDATORY_MANPATH	/usr/X11R6/man
 #
 MANPATH_MAP	/bin			/usr/share/man
 MANPATH_MAP	/usr/bin		/usr/share/man
-MANPATH_MAP	/usr/ucb		/usr/share/man
-MANPATH_MAP	/usr/local/mh		/usr/local/mh/man
 MANPATH_MAP	/usr/local/bin		/usr/local/man
-MANPATH_MAP	/usr/X386/bin		/usr/X386/man
+#MANPATH_MAP	/usr/X386/bin		/usr/X386/man
 MANPATH_MAP	/usr/X11R6/bin		/usr/X11R6/man
diff --git a/gnu/usr.bin/man/manpath/manpath.man b/gnu/usr.bin/man/manpath/manpath.man
index 921232474e1f0..429534fdc73e4 100644
--- a/gnu/usr.bin/man/manpath/manpath.man
+++ b/gnu/usr.bin/man/manpath/manpath.man
@@ -12,45 +12,57 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.TH manpath 1 "Jan 5, 1991"
-.LO 1
-.SH NAME
-manpath \- determine user's search path for man pages
-.SH SYNOPSIS
-manpath [\-q]
-.SH DESCRIPTION
-manpath tries to determine the user's manpath from a set of system
+.Dd Jan 5, 1991
+.Dt MANPATH 1
+.Os
+.Sh NAME
+.Nm manpath
+.Nd determine user's search path for man pages
+.Sh SYNOPSIS
+.Nm
+.Op Fl q
+.Sh DESCRIPTION
+.Nm manpath
+tries to determine the user's manpath from a set of system
 defaults and the user's
-.B PATH ,
+.Ev PATH ,
 echoing the result to the standard output.  Warnings and errors are
 written to the standard error.
 If a directory in the user's path is not listed in the manpath.config
 file, manpath looks for the subdirectories man or MAN.  If they exist,
 they are added to the search path.
-.PP
-manpath is used by
-.B man
+.Pp
+.Nm
+manpath
+is used by
+.Nm man
 to determine the search path, so user's normally don't need to set the
-.B MANPATH
+.Ev MANPATH
 environment variable directly.
-.SH OPTIONS
-.TP
-.B \-\^q
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl q
 Operate quietly.  Only echo the final manpath.
-.SH ENVIRONMENT
-.TP \w'MANPATH\ \ 'u
-.B MANPATH
+.El
+.Sh ENVIRONMENT
+.Bl -tag -width MANPATH -compact
+.It Ev MANPATH
 If
-.B MANPATH
+.Ev MANPATH
 is set,
-.B manpath
+.Nm manpath
 echoes its value on the standard output and issues a warning on the
 standard error.
-.SH FILES
-.TP \w'%manpath_config_file%'u+2n
-.BI %manpath_config_file%
+.El
+.Sh FILES
+.Bl -tag -width %manpath_config_file% -compact
+.It Pa %manpath_config_file%
 System configuration file.
-.SH "SEE ALSO"
-apropos(1), whatis(1), man(1).
-.SH BUGS
+.El
+.Sh SEE ALSO
+.Xr apropos 1 ,
+.Xr whatis 1 ,
+.Xr man 1
+.Sh BUGS
 None known.
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 7b3224aba1fe0..151aabe166a9f 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -42,7 +42,7 @@
 #define	FNM_PATHNAME	0x02	/* Slash must be matched by slash. */
 #define	FNM_PERIOD	0x04	/* Period must be matched by period. */
 #ifndef _POSIX_SOURCE
-#define	FNM_LEADING_DIR	0x08	/* Ignore "/*" after match. */
+#define	FNM_LEADING_DIR	0x08	/* Ignore /<tail> after Imatch. */
 #define	FNM_CASEFOLD	0x10	/* Case insensitive search. */
 #endif
 
diff --git a/include/time.h b/include/time.h
index 0c119a3c3ede0..1051f271e57e5 100644
--- a/include/time.h
+++ b/include/time.h
@@ -102,9 +102,9 @@ time_t time __P((time_t *));
 
 #ifdef	_THREAD_SAFE
 int asctime_r __P((const struct tm *, char *, int));
-int	ctime_r __P((const time_t *, char *, int));
-int	gmtime_r __P((const time_t *, struct tm *));
-int localtime_r __P((const time_t *, struct tm *));
+int ctime_r __P((const time_t *, char *, int));
+struct tm *gmtime_r __P((const time_t *, struct tm *));
+struct tm *localtime_r __P((const time_t *, struct tm *));
 #endif
 
 #ifndef _ANSI_SOURCE