Module Name: src
Committed By: joerg
Date: Wed Jan 12 23:02:22 UTC 2011
Modified Files:
src/distrib/sets/lists/text: mi
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib/libman: Makefile
src/external/bsd/mdocml/lib/libmdoc: Makefile
src/external/bsd/mdocml/lib/libroff: Makefile
src/external/bsd/mdocml/man: Makefile
Log Message:
Update build system for mdocml-1.10.9.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/text/mi
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/lib/libman/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/lib/libmdoc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/lib/libroff/Makefile
cvs rdiff -u -r1.5 -r1.6 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.39 src/distrib/sets/lists/text/mi:1.40
--- src/distrib/sets/lists/text/mi:1.39 Wed Jun 16 18:10:57 2010
+++ src/distrib/sets/lists/text/mi Wed Jan 12 23:02:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.39 2010/06/16 18:10:57 joerg Exp $
+# $NetBSD: mi,v 1.40 2011/01/12 23:02:21 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -465,6 +465,7 @@
./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
+./usr/share/man/cat7/mandoc_tbl.0 text-mdocml-catman .cat
./usr/share/man/cat7/manuals.0 text-obsolete obsolete
./usr/share/man/cat7/mdoc.samples.0 text-groff-catman .cat,groff
./usr/share/man/cat7/me.0 text-groff-catman .cat
@@ -522,6 +523,7 @@
./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
+./usr/share/man/html7/mandoc_tbl.html text-mdocml-htmlman html
./usr/share/man/html7/manuals.html text-obsolete obsolete
./usr/share/man/html7/mdoc.samples.html text-groff-htmlman html,groff
./usr/share/man/html7/me.html text-groff-htmlman html
@@ -582,6 +584,7 @@
./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
+./usr/share/man/man7/mandoc_tbl.7 text-mdocml-man .man
./usr/share/man/man7/manuals.7 text-obsolete obsolete
./usr/share/man/man7/mdoc.samples.7 text-groff-man .man,groff
./usr/share/man/man7/me.7 text-groff-man .man
Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.3 src/external/bsd/mdocml/bin/mandoc/Makefile:1.4
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.3 Thu Jun 24 17:20:19 2010
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Wed Jan 12 23:02:21 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2010/06/24 17:20:19 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/01/12 23:02:21 joerg Exp $
.include <bsd.own.mk>
PROG= mandoc
SRCS= main.c mdoc_term.c chars.c term.c term_ascii.c term_ps.c \
- tree.c compat.c \
+ tbl_term.c tbl_html.c tree.c compat.c \
man_term.c html.c mdoc_html.c man_html.c out.c
.ifndef HOSTPROG
Index: src/external/bsd/mdocml/lib/libman/Makefile
diff -u src/external/bsd/mdocml/lib/libman/Makefile:1.1 src/external/bsd/mdocml/lib/libman/Makefile:1.2
--- src/external/bsd/mdocml/lib/libman/Makefile:1.1 Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/lib/libman/Makefile Wed Jan 12 23:02:22 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/01/12 23:02:22 joerg Exp $
LIBISPRIVATE= yes
LIB= man
SRCS= man_macro.c man.c man_hash.c man_validate.c \
- man_action.c mandoc.c man_argv.c
+ mandoc.c man_argv.c
MAN= mdoc.3
.include <bsd.lib.mk>
Index: src/external/bsd/mdocml/lib/libmdoc/Makefile
diff -u src/external/bsd/mdocml/lib/libmdoc/Makefile:1.1 src/external/bsd/mdocml/lib/libmdoc/Makefile:1.2
--- src/external/bsd/mdocml/lib/libmdoc/Makefile:1.1 Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/lib/libmdoc/Makefile Wed Jan 12 23:02:22 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/01/12 23:02:22 joerg Exp $
LIBISPRIVATE= yes
LIB= mdoc
SRCS= mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
- mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+ mdoc_argv.c mdoc_validate.c lib.c att.c \
arch.c vol.c msec.c st.c mandoc.c
MAN= man.3
Index: src/external/bsd/mdocml/lib/libroff/Makefile
diff -u src/external/bsd/mdocml/lib/libroff/Makefile:1.1 src/external/bsd/mdocml/lib/libroff/Makefile:1.2
--- src/external/bsd/mdocml/lib/libroff/Makefile:1.1 Tue Jun 1 21:32:40 2010
+++ src/external/bsd/mdocml/lib/libroff/Makefile Wed Jan 12 23:02:22 2011
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2010/06/01 21:32:40 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/01/12 23:02:22 joerg Exp $
LIBISPRIVATE= yes
LIB= roff
-SRCS= roff.c
+SRCS= roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c
MAN=
+COPTS.tbl_layout.c= -Wno-shadow
+
.include <bsd.lib.mk>
Index: src/external/bsd/mdocml/man/Makefile
diff -u src/external/bsd/mdocml/man/Makefile:1.5 src/external/bsd/mdocml/man/Makefile:1.6
--- src/external/bsd/mdocml/man/Makefile:1.5 Mon Jul 26 17:25:31 2010
+++ src/external/bsd/mdocml/man/Makefile Wed Jan 12 23:02:22 2011
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/07/26 17:25:31 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/01/12 23:02:22 joerg Exp $
-MAN= mandoc_man.7 mandoc_char.7 mandoc_mdoc.7 mandoc_roff.7
+MAN= mandoc_man.7 mandoc_char.7 mandoc_mdoc.7 mandoc_roff.7 mandoc_tbl.7
.include <bsd.init.mk>
@@ -19,11 +19,17 @@
rm -f ${.TARGET}
${TOOL_CAT} ${DISTDIR}/roff.7 > ${.TARGET}
-CLEANFILES+= mandoc_man.7 mandoc_mdoc.7 mandoc_roff.7
+mandoc_tbl.7: ${DISTDIR}/tbl.7
+ ${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
+ ${TOOL_CAT} ${DISTDIR}/tbl.7 > ${.TARGET}
+
+CLEANFILES+= mandoc_man.7 mandoc_mdoc.7 mandoc_roff.7 mandoc_tbl.7
.if (${MKHTML} != "no") && (${MKMAN} != "no")
-FILES= ${DISTDIR}/style.css
+FILES= ${DISTDIR}/example.style.css
FILESDIR= /usr/share/man
+FILESNAME= style.css
.endif
.include <bsd.man.mk>
