[src/trunk]: src Update build system and import script for mdocml 1.12.3.

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

details:   https://anonhg.NetBSD.org/src/rev/cc652255cc21
branches:  trunk
changeset: 325768:cc652255cc21
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Jan 05 19:49:57 2014 +0000

description:
Update build system and import script for mdocml 1.12.3.

diffstat:

 external/bsd/mdocml/Makefile.inc      |  11 ++++++-----
 external/bsd/mdocml/prepare-import.sh |   2 +-
 tools/mandoc/Makefile                 |  19 +++----------------
 3 files changed, 10 insertions(+), 22 deletions(-)

diffs (67 lines):

diff -r 033ff03c68fd -r cc652255cc21 external/bsd/mdocml/Makefile.inc
--- a/external/bsd/mdocml/Makefile.inc  Sun Jan 05 19:27:20 2014 +0000
+++ b/external/bsd/mdocml/Makefile.inc  Sun Jan 05 19:49:57 2014 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.15 2012/02/16 22:56:12 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.16 2014/01/05 19:49:57 joerg Exp $
 
 .include <bsd.own.mk>
 
-VERSION!=      cd ${.PARSEDIR}/dist && ${MAKE} -V VERSION
-
-CPPFLAGS+=     -DVERSION=\"${VERSION}\" -DUGLY
 
 .if (${HOSTPROG:U} == "")
-CPPFLAGS+=     -DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRPTIME -DHAVE_MMAP
+CPPFLAGS+=     -DHAVE_FGETLN -DHAVE_MMAP -DHAVE_GETSUBOPT \
+               -DHAVE_STRCASESTR -DHAVE_STRLCAT -DHAVE_STRLCPY \
+               -DHAVE_STRNLEN -DHAVE_STRPTIME -DHAVE_STRSEP
+VERSION!=      cd ${.PARSEDIR}/dist && ${MAKE} -V VERSION
+CPPFLAGS+=     -DVERSION=\"${VERSION}\"
 .endif
 
 DISTDIR:=      ${.PARSEDIR}/dist
diff -r 033ff03c68fd -r cc652255cc21 external/bsd/mdocml/prepare-import.sh
--- a/external/bsd/mdocml/prepare-import.sh     Sun Jan 05 19:27:20 2014 +0000
+++ b/external/bsd/mdocml/prepare-import.sh     Sun Jan 05 19:49:57 2014 +0000
@@ -2,7 +2,7 @@
 
 set -e
 
-rm -rf ChangeLog.xsl style.css index.css *.sgml
+rm -rf CVS ChangeLog.xsl style.css index.css *.sgml regress
 
 uuencode external.png < external.png > external.png.uu
 rm external.png
diff -r 033ff03c68fd -r cc652255cc21 tools/mandoc/Makefile
--- a/tools/mandoc/Makefile     Sun Jan 05 19:27:20 2014 +0000
+++ b/tools/mandoc/Makefile     Sun Jan 05 19:49:57 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2010/02/20 13:43:31 joerg Exp $
+#      $NetBSD: Makefile,v 1.6 2014/01/05 19:49:57 joerg Exp $
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}mandoc
 HOST_SRCDIR=   external/bsd/mdocml/bin/mandoc
@@ -17,20 +17,7 @@
 
 CLEANFILES+=   config.log config.h
 
-config.h: config.h.pre config.h.post
-       rm -f config.log
-       ( cat ${DISTDIR}/config.h.pre; \
-       echo; \
-       if $(CC) $(CFLAGS) -Werror -c ${DISTDIR}/test-strlcat.c >> config.log 2>&1; then \
-               echo '#define HAVE_STRLCAT'; \
-               rm test-strlcat.o; \
-       fi; \
-       if $(CC) $(CFLAGS) -Werror -c ${DISTDIR}/test-strlcpy.c >> config.log 2>&1; then \
-               echo '#define HAVE_STRLCPY'; \
-               rm test-strlcpy.o; \
-       fi; \
-       echo; \
-       cat ${DISTDIR}/config.h.post \
-       ) > $@
+config.h: configure config.h.pre config.h.post
+       SRCDIR=${DISTDIR} ${HOST_SH} -x ${DISTDIR}/configure
 
 .include "${.CURDIR}/../Makefile.host"