Module Name: src
Committed By: joerg
Date: Sun Jan 5 19:49:57 UTC 2014
Modified Files:
src/external/bsd/mdocml: Makefile.inc prepare-import.sh
src/tools/mandoc: Makefile
Log Message:
Update build system and import script for mdocml 1.12.3.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/mdocml/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/prepare-import.sh
cvs rdiff -u -r1.5 -r1.6 src/tools/mandoc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/Makefile.inc
diff -u src/external/bsd/mdocml/Makefile.inc:1.15 src/external/bsd/mdocml/Makefile.inc:1.16
--- src/external/bsd/mdocml/Makefile.inc:1.15 Thu Feb 16 22:56:12 2012
+++ src/external/bsd/mdocml/Makefile.inc Sun Jan 5 19:49:57 2014
@@ -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
Index: src/external/bsd/mdocml/prepare-import.sh
diff -u src/external/bsd/mdocml/prepare-import.sh:1.6 src/external/bsd/mdocml/prepare-import.sh:1.7
--- src/external/bsd/mdocml/prepare-import.sh:1.6 Sun Dec 29 00:23:34 2013
+++ src/external/bsd/mdocml/prepare-import.sh Sun Jan 5 19:49:57 2014
@@ -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
Index: src/tools/mandoc/Makefile
diff -u src/tools/mandoc/Makefile:1.5 src/tools/mandoc/Makefile:1.6
--- src/tools/mandoc/Makefile:1.5 Sat Feb 20 13:43:31 2010
+++ src/tools/mandoc/Makefile Sun Jan 5 19:49:57 2014
@@ -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 @@ DPSRCS+= config.h
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"
