From owner-svn-src-all@FreeBSD.ORG Sun Nov 23 22:28:48 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63154322; Sun, 23 Nov 2014 22:28:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34D8EF28; Sun, 23 Nov 2014 22:28:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANMSm9h021857; Sun, 23 Nov 2014 22:28:48 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANMSlKd021852; Sun, 23 Nov 2014 22:28:47 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201411232228.sANMSlKd021852@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 23 Nov 2014 22:28:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274930 - in head: gnu/usr.bin/groff/tmac tools/build/mk usr.bin/mandoc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Nov 2014 22:28:48 -0000 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 \