svn commit: r274930 - in head: gnu/usr.bin/groff/tmac tools/build/mk usr.bin/mandoc

[Baptiste Daroussin]

Author: bapt
Date: Sun Nov 23 22:28:46 2014
New Revision: 274930
URL: https://svnweb.freebsd.org/changeset/base/274930

Log:
  Install mdoc(7) and man(7) from mdoc instead of the one from groff

Modified:
  head/gnu/usr.bin/groff/tmac/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/mandoc/Makefile

Modified: head/gnu/usr.bin/groff/tmac/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/tmac/Makefile	Sun Nov 23 22:16:43 2014	(r274929)
+++ head/gnu/usr.bin/groff/tmac/Makefile	Sun Nov 23 22:28:46 2014	(r274930)
@@ -11,9 +11,8 @@ MDOCDIR?=	${TMACDIR}/mdoc
 MAN=		groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7
 MAN+=		groff_trace.7 groff_www.7
 MLINKS=		groff_ms.7 ms.7
-MLINKS+=	groff_man.7 man.7
 MLINKS+=	groff_me.7 me.7
-MLINKS+=	groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7
+MLINKS+=	groff_mdoc.7 mdoc.samples.7
 
 CLEANFILES=	${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/}
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 23 22:16:43 2014	(r274929)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sun Nov 23 22:28:46 2014	(r274930)
@@ -1737,8 +1737,6 @@ OLD_FILES+=usr/share/man/man7/groff_mmse
 OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
 OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
 OLD_FILES+=usr/share/man/man7/groff_www.7.gz
-OLD_FILES+=usr/share/man/man7/man.7.gz
-OLD_FILES+=usr/share/man/man7/mdoc.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
 OLD_FILES+=usr/share/man/man7/me.7.gz
 OLD_FILES+=usr/share/man/man7/mm.7.gz

Modified: head/usr.bin/mandoc/Makefile
==============================================================================
--- head/usr.bin/mandoc/Makefile	Sun Nov 23 22:16:43 2014	(r274929)
+++ head/usr.bin/mandoc/Makefile	Sun Nov 23 22:28:46 2014	(r274930)
@@ -8,7 +8,7 @@ PROG=	mandoc
 FILES=	example.style.css style.css
 FILESDIR=	${SHAREDIR}/mdocml
 LINKS=	mdocml
-MAN=	mandoc.1 eqn.7 mandoc_char.7 tbl.7 # man.7 mdoc.7 roff.7
+MAN=	mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7
 MLINKS= mandoc.1 mdocml.1
 
 HTML_SRCS=	eqn_html.c \