groff 1.15 plus local changes (insomnia strikes):

o moved *.man to *.$section_in and generate *.$section not *.n for bsd.man.mk
o modified groff Makefiles to not install man pages (we do it ourselves)
o use mkstemp everywhere
o don't install groff versions on mdoc macros, we want our own ones

2 files changed, 15 insertions, 4 deletions

diff --git a/gnu/usr.bin/groff/troff/Makefile.sub b/gnu/usr.bin/groff/troff/Makefile.sub
index dc67031fee2..28b5dd18eb2 100644
--- a/gnu/usr.bin/groff/troff/Makefile.sub
+++ b/gnu/usr.bin/groff/troff/Makefile.sub
@@ -1,5 +1,5 @@
 PROG=troff
-MAN1=troff.n
+MAN1=troff.1
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=env.o node.o input.o div.o symbol.o dictionary.o reg.o \
diff --git a/gnu/usr.bin/groff/troff/troff.man b/gnu/usr.bin/groff/troff/troff.1_in
index c355b86b8d9..c3249672129 100644
--- a/gnu/usr.bin/groff/troff/troff.man
+++ b/gnu/usr.bin/groff/troff/troff.1_in
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -47,7 +47,7 @@ the original English.
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-abivzCER
+.OP \-abivzCERU
 .OP \-w name
 .OP \-W name
 .OP \-d cs
@@ -80,7 +80,9 @@ approximation of the typeset output.
 .B \-b
 Print a backtrace with each warning or error message.  This backtrace
 should help track down the cause of the error.  The line numbers given
-in the backtrace may not always correct: troff's idea of line numbers
+in the backtrace may not always be correct:
+.B troff 's
+idea of line numbers
 gets confused by
 .B as
 or 
@@ -140,6 +142,14 @@ as the default font family.
 Read in the file
 .BI tmac. name\fR.
 Normally this will be searched for in @MACRODIR@.
+By default is used the 
+.I safer
+macro (reverted using -U ).
+.TP
+.B \-U
+Unsafe option, avoids default use of 
+.I safer
+macro.
 .TP
 .B \-R
 Don't load
@@ -2046,6 +2056,7 @@ of device
 .BR grops (@MAN1EXT@),
 .BR grodvi (@MAN1EXT@),
 .BR grotty (@MAN1EXT@),
+.BR grohtml (@MAN1EXT@),
 .BR deroff (@MAN1EXT@),
 .BR groff_font (@MAN5EXT@),
 .BR groff_out (@MAN5EXT@),