[src/trunk]: src/external/bsd/mdocml mandoc needs mandoc_xr.c and (because we...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fcf40508d2c1
branches:  trunk
changeset: 365456:fcf40508d2c1
user:      kre <kre%NetBSD.org@localhost>
date:      Thu Aug 16 05:03:17 2018 +0000

description:
mandoc needs mandoc_xr.c and (because we do not have it in libc, which
should remain the state forever IMO) compat_recallocarray.c

And now that compat_recallocarray() is in libmandoc we no longer
need to manually add its source to mandoc (either the full, or the
tools builds).

diffstat:

 external/bsd/mdocml/bin/mandoc/Makefile    |  6 ++----
 external/bsd/mdocml/lib/libmandoc/Makefile |  4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 1ec3fd0140c6 -r fcf40508d2c1 external/bsd/mdocml/bin/mandoc/Makefile
--- a/external/bsd/mdocml/bin/mandoc/Makefile   Thu Aug 16 03:59:52 2018 +0000
+++ b/external/bsd/mdocml/bin/mandoc/Makefile   Thu Aug 16 05:03:17 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/08/16 03:59:52 kre Exp $
+# $NetBSD: Makefile,v 1.16 2018/08/16 05:03:17 kre Exp $
 
 .include <bsd.own.mk>
 
@@ -31,12 +31,10 @@
 DPADD+=        ${MDOCMLLIB.mandoc} ${LIBZ}
 LDADD+=        -L${MDOCMLOBJDIR.mandoc} -lmandoc -lz
 CPPFLAGS+=     -DUSE_WCHAR
-SRCS+=         compat_recallocarray.c
 .else
 SRCS.libmandoc!=cd ${.PARSEDIR}/../../lib/libmandoc && ${MAKE} -v SRCS
 
-SRCS+=         ${SRCS.libmandoc} compat_strtonum.c compat_reallocarray.c \
-               compat_recallocarray.c
+SRCS+=         ${SRCS.libmandoc} compat_strtonum.c compat_reallocarray.c
 .endif
 
 COPTS.man_term.c+= -Wno-error=array-bounds
diff -r 1ec3fd0140c6 -r fcf40508d2c1 external/bsd/mdocml/lib/libmandoc/Makefile
--- a/external/bsd/mdocml/lib/libmandoc/Makefile        Thu Aug 16 03:59:52 2018 +0000
+++ b/external/bsd/mdocml/lib/libmandoc/Makefile        Thu Aug 16 05:03:17 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/08/16 01:08:18 kre Exp $
+# $NetBSD: Makefile,v 1.11 2018/08/16 05:03:17 kre Exp $
 
 LIBISPRIVATE=  yes
 
@@ -7,6 +7,7 @@
 att.c \
 chars.c \
 compat_ohash.c \
+compat_recallocarray.c \
 eqn.c \
 lib.c \
 man.c \
@@ -15,6 +16,7 @@
 mandoc.c \
 mandoc_aux.c \
 mandoc_ohash.c \
+mandoc_xr.c \
 mdoc.c \
 mdoc_argv.c \
 mdoc_macro.c \