Module Name: src
Committed By: joerg
Date: Tue Oct 11 19:20:14 UTC 2011
Modified Files:
src/distrib/sets/lists/text: mi
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib/libmandoc: Makefile
src/external/bsd/mdocml/man: Makefile
Log Message:
Update build system for mdocml 1.12.0.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/text/mi
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/lib/libmandoc/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/man/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/text/mi
diff -u src/distrib/sets/lists/text/mi:1.40 src/distrib/sets/lists/text/mi:1.41
--- src/distrib/sets/lists/text/mi:1.40 Wed Jan 12 23:02:21 2011
+++ src/distrib/sets/lists/text/mi Tue Oct 11 19:20:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.40 2011/01/12 23:02:21 joerg Exp $
+# $NetBSD: mi,v 1.41 2011/10/11 19:20:13 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -462,6 +462,7 @@
./usr/share/man/cat7/groff_www.0 text-groff-catman .cat,groff
./usr/share/man/cat7/man.0 text-groff-catman .cat,groff
./usr/share/man/cat7/mandoc_char.0 text-mdocml-catman .cat
+./usr/share/man/cat7/mandoc_eqn.0 text-mdocml-catman .cat
./usr/share/man/cat7/mandoc_man.0 text-mdocml-catman .cat
./usr/share/man/cat7/mandoc_mdoc.0 text-mdocml-catman .cat
./usr/share/man/cat7/mandoc_roff.0 text-mdocml-catman .cat
@@ -520,6 +521,7 @@
./usr/share/man/html7/groff_www.html text-groff-htmlman html,groff
./usr/share/man/html7/man.html text-groff-htmlman html,groff
./usr/share/man/html7/mandoc_char.html text-mdocml-htmlman html
+./usr/share/man/html7/mandoc_eqn.html text-mdocml-htmlman html
./usr/share/man/html7/mandoc_man.html text-mdocml-htmlman html
./usr/share/man/html7/mandoc_mdoc.html text-mdocml-htmlman html
./usr/share/man/html7/mandoc_roff.html text-mdocml-htmlman html
@@ -581,6 +583,7 @@
./usr/share/man/man7/groff_www.7 text-groff-man .man,groff
./usr/share/man/man7/man.7 text-groff-man .man,groff
./usr/share/man/man7/mandoc_char.7 text-mdocml-man .man
+./usr/share/man/man7/mandoc_eqn.7 text-mdocml-man .man
./usr/share/man/man7/mandoc_man.7 text-mdocml-man .man
./usr/share/man/man7/mandoc_mdoc.7 text-mdocml-man .man
./usr/share/man/man7/mandoc_roff.7 text-mdocml-man .man
Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.5 src/external/bsd/mdocml/bin/mandoc/Makefile:1.6
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.5 Fri Apr 15 14:36:30 2011
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Tue Oct 11 19:20:13 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2011/04/15 14:36:30 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/11 19:20:13 joerg Exp $
.include <bsd.own.mk>
PROG= mandoc
SRCS= chars.c main.c out.c tree.c \
+ eqn_html.c eqn_term.c \
html.c man_html.c mdoc_html.c tbl_html.c \
man_term.c mdoc_term.c term.c term_ascii.c \
term_ps.c tbl_term.c
Index: src/external/bsd/mdocml/lib/libmandoc/Makefile
diff -u src/external/bsd/mdocml/lib/libmandoc/Makefile:1.3 src/external/bsd/mdocml/lib/libmandoc/Makefile:1.4
--- src/external/bsd/mdocml/lib/libmandoc/Makefile:1.3 Wed Aug 17 09:30:13 2011
+++ src/external/bsd/mdocml/lib/libmandoc/Makefile Tue Oct 11 19:20:14 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/08/17 09:30:13 christos Exp $
+# $NetBSD: Makefile,v 1.4 2011/10/11 19:20:14 joerg Exp $
LIBISPRIVATE= yes
LIB= mandoc
SRCS= man.c man_hash.c man_macro.c man_validate.c \
arch.c att.c lib.c mdoc.c mdoc_argv.c mdoc_hash.c mdoc_macro.c \
- mdoc_validate.c msec.c st.c vol.c \
+ mdoc_man.c mdoc_validate.c msec.c st.c vol.c \
eqn.c roff.c tbl.c tbl_data.c tbl_layout.c tbl_opts.c \
mandoc.c read.c
MAN= mandoc.3
Index: src/external/bsd/mdocml/man/Makefile
diff -u src/external/bsd/mdocml/man/Makefile:1.6 src/external/bsd/mdocml/man/Makefile:1.7
--- src/external/bsd/mdocml/man/Makefile:1.6 Wed Jan 12 23:02:22 2011
+++ src/external/bsd/mdocml/man/Makefile Tue Oct 11 19:20:14 2011
@@ -1,9 +1,15 @@
-# $NetBSD: Makefile,v 1.6 2011/01/12 23:02:22 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2011/10/11 19:20:14 joerg Exp $
-MAN= mandoc_man.7 mandoc_char.7 mandoc_mdoc.7 mandoc_roff.7 mandoc_tbl.7
+MAN= mandoc_man.7 mandoc_char.7 mandoc_eqn.7 mandoc_mdoc.7 \
+ mandoc_roff.7 mandoc_tbl.7
.include <bsd.init.mk>
+mandoc_eqn.7: ${DISTDIR}/eqn.7
+ ${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
+ ${TOOL_CAT} ${DISTDIR}/eqn.7 > ${.TARGET}
+
mandoc_man.7: ${DISTDIR}/man.7
${_MKTARGET_CREATE}
rm -f ${.TARGET}
@@ -24,7 +30,8 @@ mandoc_tbl.7: ${DISTDIR}/tbl.7
rm -f ${.TARGET}
${TOOL_CAT} ${DISTDIR}/tbl.7 > ${.TARGET}
-CLEANFILES+= mandoc_man.7 mandoc_mdoc.7 mandoc_roff.7 mandoc_tbl.7
+CLEANFILES+= mandoc_eqn.7 mandoc_man.7 mandoc_mdoc.7 \
+ mandoc_roff.7 mandoc_tbl.7
.if (${MKHTML} != "no") && (${MKMAN} != "no")
FILES= ${DISTDIR}/example.style.css
