Module Name: src
Committed By: joerg
Date: Fri Apr 15 14:36:31 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/bsd/mdocml: Makefile.inc
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib: Makefile
Added Files:
src/external/bsd/mdocml/lib/libmandoc: Makefile
Removed Files:
src/external/bsd/mdocml/lib/libman: Makefile
src/external/bsd/mdocml/lib/libmdoc: Makefile
src/external/bsd/mdocml/lib/libroff: Makefile
Log Message:
Update build glue for mdocml 1.11.1.
To generate a diff of this commit:
cvs rdiff -u -r1.1614 -r1.1615 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/mdocml/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/lib/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/mdocml/lib/libman/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/lib/libmandoc/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/mdocml/lib/libmdoc/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/mdocml/lib/libroff/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1614 src/distrib/sets/lists/comp/mi:1.1615
--- src/distrib/sets/lists/comp/mi:1.1614 Tue Apr 12 08:22:48 2011
+++ src/distrib/sets/lists/comp/mi Fri Apr 15 14:36:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1614 2011/04/12 08:22:48 jruoho Exp $
+# $NetBSD: mi,v 1.1615 2011/04/15 14:36:28 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -7348,7 +7348,8 @@
./usr/share/man/cat3/makecontext.0 comp-c-catman .cat
./usr/share/man/cat3/makedev.0 comp-c-catman .cat
./usr/share/man/cat3/malloc.0 comp-c-catman .cat
-./usr/share/man/cat3/man.0 comp-mdocml-catman .cat
+./usr/share/man/cat3/man.0 comp-obsolete obsolete
+./usr/share/man/cat3/mandoc.0 comp-mdocml-catman .cat
./usr/share/man/cat3/math.0 comp-c-catman .cat
./usr/share/man/cat3/mblen.0 comp-c-catman .cat
./usr/share/man/cat3/mbrlen.0 comp-c-catman .cat
@@ -7361,7 +7362,7 @@
./usr/share/man/cat3/md4.0 comp-c-catman .cat
./usr/share/man/cat3/md5.0 comp-c-catman .cat
./usr/share/man/cat3/mdc2.0 comp-obsolete obsolete
-./usr/share/man/cat3/mdoc.0 comp-mdocml-catman .cat
+./usr/share/man/cat3/mdoc.0 comp-obsolete obsolete
./usr/share/man/cat3/membar_consumer.0 comp-c-catman .cat
./usr/share/man/cat3/membar_enter.0 comp-c-catman .cat
./usr/share/man/cat3/membar_exit.0 comp-c-catman .cat
@@ -13400,7 +13401,8 @@
./usr/share/man/html3/makecontext.html comp-c-htmlman html
./usr/share/man/html3/makedev.html comp-c-htmlman html
./usr/share/man/html3/malloc.html comp-c-htmlman html
-./usr/share/man/html3/man.html comp-mdocml-htmlman html
+./usr/share/man/html3/man.html comp-obsolete obsolete
+./usr/share/man/html3/mandoc.html comp-mdocml-htmlman html
./usr/share/man/html3/math.html comp-c-htmlman html
./usr/share/man/html3/mblen.html comp-c-htmlman html
./usr/share/man/html3/mbrlen.html comp-c-htmlman html
@@ -13412,7 +13414,7 @@
./usr/share/man/html3/md2.html comp-c-htmlman html
./usr/share/man/html3/md4.html comp-c-htmlman html
./usr/share/man/html3/md5.html comp-c-htmlman html
-./usr/share/man/html3/mdoc.html comp-mdocml-htmlman html
+./usr/share/man/html3/mdoc.html comp-obsolete obsolete
./usr/share/man/html3/membar_consumer.html comp-c-htmlman html
./usr/share/man/html3/membar_enter.html comp-c-htmlman html
./usr/share/man/html3/membar_exit.html comp-c-htmlman html
@@ -19436,7 +19438,8 @@
./usr/share/man/man3/makecontext.3 comp-c-man .man
./usr/share/man/man3/makedev.3 comp-c-man .man
./usr/share/man/man3/malloc.3 comp-c-man .man
-./usr/share/man/man3/man.3 comp-mdocml-man .man
+./usr/share/man/man3/man.3 comp-obsolete obsolete
+./usr/share/man/man3/mandoc.3 comp-mdocml-man .man
./usr/share/man/man3/math.3 comp-c-man .man
./usr/share/man/man3/mblen.3 comp-c-man .man
./usr/share/man/man3/mbrlen.3 comp-c-man .man
@@ -19449,7 +19452,7 @@
./usr/share/man/man3/md4.3 comp-c-man .man
./usr/share/man/man3/md5.3 comp-c-man .man
./usr/share/man/man3/mdc2.3 comp-obsolete obsolete
-./usr/share/man/man3/mdoc.3 comp-mdocml-man .man
+./usr/share/man/man3/mdoc.3 comp-obsolete obsolete
./usr/share/man/man3/membar_consumer.3 comp-c-man .man
./usr/share/man/man3/membar_enter.3 comp-c-man .man
./usr/share/man/man3/membar_exit.3 comp-c-man .man
Index: src/external/bsd/mdocml/Makefile.inc
diff -u src/external/bsd/mdocml/Makefile.inc:1.12 src/external/bsd/mdocml/Makefile.inc:1.13
--- src/external/bsd/mdocml/Makefile.inc:1.12 Sun Jul 25 19:16:18 2010
+++ src/external/bsd/mdocml/Makefile.inc Fri Apr 15 14:36:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2010/07/25 19:16:18 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.13 2011/04/15 14:36:30 joerg Exp $
.include <bsd.own.mk>
@@ -7,15 +7,14 @@
CPPFLAGS+= -DVERSION=\"${VERSION}\" -DUGLY
.if (${HOSTPROG:U} == "")
-CPPFLAGE+= -DHAVE_STRLCAT -DHAVE_STRLCPY
+CPPFLAGS+= -DHAVE_STRLCAT -DHAVE_STRLCPY
.endif
-
DISTDIR:= ${.PARSEDIR}/dist
.PATH: ${DISTDIR}
-.for _LIB in man mdoc roff
+.for _LIB in mandoc
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.4 src/external/bsd/mdocml/bin/mandoc/Makefile:1.5
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.4 Wed Jan 12 23:02:21 2011
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Fri Apr 15 14:36:30 2011
@@ -1,24 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2011/01/12 23:02:21 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/15 14:36:30 joerg Exp $
.include <bsd.own.mk>
PROG= mandoc
-SRCS= main.c mdoc_term.c chars.c term.c term_ascii.c term_ps.c \
- tbl_term.c tbl_html.c tree.c compat.c \
- man_term.c html.c mdoc_html.c man_html.c out.c
+SRCS= chars.c main.c out.c tree.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
.ifndef HOSTPROG
-DPADD+= ${MDOCMLLIB.man} ${MDOCMLLIB.mdoc} ${MDOCMLLIB.roff}
-LDADD+= -L${MDOCMLOBJDIR.man} -lman \
- -L${MDOCMLOBJDIR.mdoc} -lmdoc \
- -L${MDOCMLOBJDIR.roff} -lroff
+DPADD+= ${MDOCMLLIB.mandoc}
+LDADD+= -L${MDOCMLOBJDIR.mandoc} -lmandoc
.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.libmandoc!=cd ${.PARSEDIR}/../../lib/libmandoc && ${MAKE} -V '$${SRCS}'
-SRCS+= ${SRCS.libman} ${SRCS.libmdoc:Nmandoc.c} ${SRCS.libroff}
+SRCS+= ${SRCS.libmandoc}
.endif
.include <bsd.prog.mk>
Index: src/external/bsd/mdocml/lib/Makefile
diff -u src/external/bsd/mdocml/lib/Makefile:1.2 src/external/bsd/mdocml/lib/Makefile:1.3
--- src/external/bsd/mdocml/lib/Makefile:1.2 Tue Jun 1 21:32:39 2010
+++ src/external/bsd/mdocml/lib/Makefile Fri Apr 15 14:36:30 2011
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2010/06/01 21:32:39 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2011/04/15 14:36:30 joerg Exp $
-SUBDIR= libman libmdoc libroff
+SUBDIR= libmandoc
.include <bsd.subdir.mk>
Added files:
Index: src/external/bsd/mdocml/lib/libmandoc/Makefile
diff -u /dev/null src/external/bsd/mdocml/lib/libmandoc/Makefile:1.1
--- /dev/null Fri Apr 15 14:36:31 2011
+++ src/external/bsd/mdocml/lib/libmandoc/Makefile Fri Apr 15 14:36:31 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/04/15 14:36:31 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 \
+ eqn.c roff.c tbl.c tbl_data.c tbl_layout.c tbl_opts.c \
+ mandoc.c read.c
+MAN= mandoc.3
+
+.include <bsd.lib.mk>
