disconnect groff_man(7) from the build and install man(7) instead;

"fine" jmc@  "no worries" deraadt@  "looks good" J.C. Roberts

diff --git a/gnu/usr.bin/groff/Makefile.bsd-wrapper b/gnu/usr.bin/groff/Makefile.bsd-wrapper
index 4ac8dbb..e54283b 100644 (file)
--- a/gnu/usr.bin/groff/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/groff/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.bsd-wrapper,v 1.18 2007/11/03 15:13:13 espie Exp $
+#      $OpenBSD: Makefile.bsd-wrapper,v 1.19 2010/07/20 19:30:18 schwarze Exp $
 
 #
 # groff config
@@ -22,10 +22,10 @@ MAN=        addftinfo/addftinfo.1 afmtodit/afmtodit.1 eqn/eqn.1 \
        man/groff_char.7 man/groff_font.5 man/groff_out.5 mm/groff_mm.7 \
        mm/groff_mmse.7 nroff/nroff.1 pfbtops/pfbtops.1 pic/pic.1 \
        psbb/psbb.1 refer/refer.1 soelim/soelim.1 tbl/tbl.1 \
-       tfmtodit/tfmtodit.1 tmac/groff_man.7 tmac/groff_me.7 tmac/groff_ms.7 \
+       tfmtodit/tfmtodit.1 tmac/groff_me.7 tmac/groff_ms.7 \
        tmac/groff_msafer.7 troff/troff.1
 
-MLINKS=        groff_man.7 man.7 groff_me.7 me.7 groff_mm.7 mm.7 groff_ms.7 ms.7 \
+MLINKS=        groff_me.7 me.7 groff_mm.7 mm.7 groff_ms.7 ms.7 \
        eqn.1 neqn.1
 
 all: config.status gnu_build

diff --git a/gnu/usr.bin/groff/groff/groff.1_in b/gnu/usr.bin/groff/groff/groff.1_in
index 545f0a0..8670c3f 100644 (file)
--- a/gnu/usr.bin/groff/groff/groff.1_in
+++ b/gnu/usr.bin/groff/groff/groff.1_in
@@ -422,7 +422,7 @@ anonymous ftp from ftp.gnu.org in the directory gnu/groff.
 .BR deroff (@MAN1EXT@),
 .BR groff_font (@MAN5EXT@),
 .BR groff_out (@MAN5EXT@),
-.BR groff_man (@MAN7EXT@),
+.BR man (@MAN7EXT@),
 .BR groff_ms (@MAN7EXT@),
 .BR groff_me (@MAN7EXT@),
 .BR groff_char (@MAN7EXT@),

diff --git a/gnu/usr.bin/groff/tmac/Makefile.sub b/gnu/usr.bin/groff/tmac/Makefile.sub
index 0528ad7..c040255 100644 (file)
--- a/gnu/usr.bin/groff/tmac/Makefile.sub
+++ b/gnu/usr.bin/groff/tmac/Makefile.sub
@@ -1,4 +1,4 @@
-MAN7=groff_ms.7 groff_man.7 groff_me.7 groff_msafer.7
+MAN7=groff_ms.7 groff_me.7 groff_msafer.7
 
 NORMALFILES=tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic \
       tmac.psatk tmac.dvi tmac.tty tmac.tty-char tmac.X tmac.Xps tmac.latin1 \

diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index e5c1ce7..2572881 100644 (file)
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,11 +1,11 @@
-#      $OpenBSD: Makefile,v 1.15 2010/01/03 23:29:03 schwarze Exp $
+#      $OpenBSD: Makefile,v 1.16 2010/07/20 19:30:18 schwarze Exp $
 #      $NetBSD: Makefile,v 1.6 1994/12/22 10:50:05 cgd Exp $
 
-# missing: eqnchar.7 man.7 ms.7 term.7
+# missing: eqnchar.7 ms.7 term.7
 
 MAN=   ascii.7 environ.7 glob.7 hier.7 hostname.7 intro.7 kgdb.7 \
        library-specs.7 mailaddr.7 \
-       mandoc_char.7 mdoc.7 mdoc.samples.7 mirroring-ports.7 \
+       man.7 mandoc_char.7 mdoc.7 mdoc.samples.7 mirroring-ports.7 \
        operator.7 packages.7 packages-specs.7 ports.7 script.7 securelevel.7
 MLINKS=        mdoc.7 mandoc.7 mdoc.samples.7 mandoc.samples.7 \
        mirroring-ports.7 mirror-maker.7