Index: head/contrib/mdocml/config.h
===================================================================
--- head/contrib/mdocml/config.h	(revision 282315)
+++ head/contrib/mdocml/config.h	(revision 282316)
@@ -1,51 +1,51 @@
 #ifndef MANDOC_CONFIG_H
 #define MANDOC_CONFIG_H
 
 #if defined(__linux__) || defined(__MINT__)
 #define _GNU_SOURCE	/* See test-*.c what needs this. */
 #endif
 
 #include <sys/types.h>
 
 #define HAVE_DIRENT_NAMLEN 1
 #define HAVE_FGETLN 1
 #define HAVE_FTS 1
 #define HAVE_GETSUBOPT 1
 #define HAVE_MMAP 1
-#define HAVE_REALLOCARRAY 0
+#define HAVE_REALLOCARRAY 1
 #define HAVE_STRCASESTR 1
 #define HAVE_STRLCAT 1
 #define HAVE_STRLCPY 1
 #define HAVE_STRPTIME 1
 #define HAVE_STRSEP 1
 #define HAVE_STRTONUM 1
 #define HAVE_WCHAR 1
 #define HAVE_SQLITE3 1
 #define HAVE_SQLITE3_ERRSTR 0
 #define HAVE_OHASH 1
 #define HAVE_MANPATH 1
 
 #define BINM_APROPOS "apropos"
 #define BINM_MAN "man"
 #define BINM_WHATIS "whatis"
 #define BINM_MAKEWHATIS "makewhatis"
 
 #if !defined(__BEGIN_DECLS)
 #  ifdef __cplusplus
 #  define	__BEGIN_DECLS		extern "C" {
 #  else
 #  define	__BEGIN_DECLS
 #  endif
 #endif
 #if !defined(__END_DECLS)
 #  ifdef __cplusplus
 #  define	__END_DECLS		}
 #  else
 #  define	__END_DECLS
 #  endif
 #endif
 
 extern	void	 *reallocarray(void *, size_t, size_t);
 extern	const char *sqlite3_errstr(int);
 
 #endif /* MANDOC_CONFIG_H */
Index: head/lib/libmandoc/Makefile
===================================================================
--- head/lib/libmandoc/Makefile	(revision 282315)
+++ head/lib/libmandoc/Makefile	(revision 282316)
@@ -1,46 +1,44 @@
 # $FreeBSD$
 
 MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
 .PATH: ${MDOCMLDIR}
 
 LIB=	mandoc
 #NO_PIC=
 INTERNALLIB=
 MAN=	mandoc.3 mandoc_headers.3
 LIBMAN_SRCS=	man.c \
 		man_hash.c \
 		man_macro.c \
 		man_validate.c
 
 LIBMDOC_SRCS=	att.c \
 		lib.c \
 		mdoc.c \
 		mdoc_argv.c \
 		mdoc_hash.c \
 		mdoc_macro.c \
 		mdoc_validate.c \
 		st.c
 
 LIBROFF_SRCS=	eqn.c \
 		roff.c \
 		tbl.c \
 		tbl_data.c \
 		tbl_layout.c \
 		tbl_opts.c
 
-COMPAT_SRCS=	compat_reallocarray.c
 SRCS=		${LIBMAN_SRCS} \
 		${LIBMDOC_SRCS} \
 		${LIBROFF_SRCS} \
-		${COMPAT_SRCS} \
 		chars.c \
 		mandoc.c \
 		mandoc_aux.c \
 		msec.c \
 		preconv.c \
 		read.c
 
 WARNS?=	3
 CFLAGS+= -DHAVE_CONFIG_H
 
 .include <bsd.lib.mk>