Module Name: src
Committed By: joerg
Date: Tue Jun 1 21:32:40 UTC 2010
Modified Files:
src/distrib/sets/lists/text: mi
src/external/bsd/mdocml: Makefile.inc
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib: Makefile
src/external/bsd/mdocml/man: Makefile
Added Files:
src/external/bsd/mdocml/lib/libroff: Makefile
Log Message:
Update to mdocml-1.10.0
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/text/mi
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/mdocml/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/lib/libroff/Makefile
cvs rdiff -u -r1.1 -r1.2 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.37 src/distrib/sets/lists/text/mi:1.38
--- src/distrib/sets/lists/text/mi:1.37 Fri May 21 21:46:49 2010
+++ src/distrib/sets/lists/text/mi Tue Jun 1 21:32:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.37 2010/05/21 21:46:49 njoly Exp $
+# $NetBSD: mi,v 1.38 2010/06/01 21:32:39 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -464,6 +464,7 @@
./usr/share/man/cat7/mandoc_char.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
./usr/share/man/cat7/manuals.0 text-mdocml-catman .cat
./usr/share/man/cat7/mdoc.samples.0 text-groff-catman .cat,groff
./usr/share/man/cat7/me.0 text-groff-catman .cat
@@ -520,6 +521,7 @@
./usr/share/man/html7/mandoc_char.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
./usr/share/man/html7/manuals.html text-mdocml-htmlman html
./usr/share/man/html7/mdoc.samples.html text-groff-htmlman html,groff
./usr/share/man/html7/me.html text-groff-htmlman html
@@ -579,6 +581,7 @@
./usr/share/man/man7/mandoc_char.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
./usr/share/man/man7/manuals.7 text-mdocml-man .man
./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/Makefile.inc
diff -u src/external/bsd/mdocml/Makefile.inc:1.7 src/external/bsd/mdocml/Makefile.inc:1.8
--- src/external/bsd/mdocml/Makefile.inc:1.7 Tue Apr 20 18:08:08 2010
+++ src/external/bsd/mdocml/Makefile.inc Tue Jun 1 21:32:39 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.7 2010/04/20 18:08:08 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2010/06/01 21:32:39 joerg Exp $
.include <bsd.own.mk>
-VERSION= 1.9.23
+VERSION= 1.10.0
-CPPFLAGS+= -DVERSION=\"${VERSION}\"
+CPPFLAGS+= -DVERSION=\"${VERSION}\" -DUGLY
.if (${HOSTPROG:U} == "")
CPPFLAGE+= -DHAVE_STRLCAT -DHAVE_STRLCPY
@@ -15,7 +15,7 @@
.PATH: ${DISTDIR}
-.for _LIB in man mdoc
+.for _LIB in man mdoc roff
MDOCMLOBJDIR.${_LIB} != cd ${.PARSEDIR}/lib/lib${_LIB} && ${PRINTOBJDIR}
MDOCMLLIB.${_LIB}= ${MDOCMLOBJDIR.${_LIB}}/lib${_LIB}.a
.endfor
Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.1 src/external/bsd/mdocml/bin/mandoc/Makefile:1.2
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.1 Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Tue Jun 1 21:32:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/01 21:32:39 joerg Exp $
.include <bsd.own.mk>
@@ -8,13 +8,16 @@
man_term.c html.c mdoc_html.c man_html.c out.c
.ifndef HOSTPROG
-DPADD+= ${MDOCMLLIB.man} ${MDOCMLLIB.mdoc}
-LDADD+= -L${MDOCMLOBJDIR.man} -lman -L${MDOCMLOBJDIR.mdoc} -lmdoc
+DPADD+= ${MDOCMLLIB.man} ${MDOCMLLIB.mdoc} ${MDOCMLLIB.roff}
+LDADD+= -L${MDOCMLOBJDIR.man} -lman \
+ -L${MDOCMLOBJDIR.mdoc} -lmdoc \
+ -L${MDOCMLOBJDIR.roff} -lroff
.else
SRCS.libman!= cd ${.PARSEDIR}/../../lib/libman && ${MAKE} -V '$${SRCS}'
SRCS.libmdoc!= cd ${.PARSEDIR}/../../lib/libmdoc && ${MAKE} -V '$${SRCS}'
+SRCS.libroff!= cd ${.PARSEDIR}/../../lib/libroff && ${MAKE} -V '$${SRCS}'
-SRCS+= ${SRCS.libman} ${SRCS.libmdoc:Nmandoc.c}
+SRCS+= ${SRCS.libman} ${SRCS.libmdoc:Nmandoc.c} ${SRCS.libroff}
.endif
.include <bsd.prog.mk>
Index: src/external/bsd/mdocml/lib/Makefile
diff -u src/external/bsd/mdocml/lib/Makefile:1.1 src/external/bsd/mdocml/lib/Makefile:1.2
--- src/external/bsd/mdocml/lib/Makefile:1.1 Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/lib/Makefile Tue Jun 1 21:32:39 2010
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/01 21:32:39 joerg Exp $
-SUBDIR= libman libmdoc
+SUBDIR= libman libmdoc libroff
.include <bsd.subdir.mk>
Index: src/external/bsd/mdocml/man/Makefile
diff -u src/external/bsd/mdocml/man/Makefile:1.1 src/external/bsd/mdocml/man/Makefile:1.2
--- src/external/bsd/mdocml/man/Makefile:1.1 Wed Oct 21 18:04:52 2009
+++ src/external/bsd/mdocml/man/Makefile Tue Jun 1 21:32:40 2010
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2009/10/21 18:04:52 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/01 21:32:40 joerg Exp $
-MAN= mandoc_man.7 mandoc_char.7 mandoc_mdoc.7 manuals.7
+MAN= mandoc_man.7 mandoc_char.7 mandoc_mdoc.7 mandoc_roff.7 \
+ manuals.7
.include <bsd.init.mk>
@@ -14,6 +15,11 @@
rm -f ${.TARGET}
${TOOL_CAT} ${DISTDIR}/mdoc.7 > ${.TARGET}
+mandoc_roff.7:
+ ${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
+ ${TOOL_CAT} ${DISTDIR}/roff.7 > ${.TARGET}
+
CLEANFILES+= mandoc_man.7 mandoc_mdoc.7
.include <bsd.man.mk>
Added files:
Index: src/external/bsd/mdocml/lib/libroff/Makefile
diff -u /dev/null src/external/bsd/mdocml/lib/libroff/Makefile:1.1
--- /dev/null Tue Jun 1 21:32:40 2010
+++ src/external/bsd/mdocml/lib/libroff/Makefile Tue Jun 1 21:32:40 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2010/06/01 21:32:40 joerg Exp $
+
+LIBISPRIVATE= yes
+
+LIB= roff
+SRCS= roff.c
+MAN=
+
+.include <bsd.lib.mk>
