Module Name: src
Committed By: christos
Date: Thu Dec 17 22:31:01 UTC 2015
Modified Files:
src/external/bsd/mdocml: Makefile.inc prepare-import.sh
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/lib/libmandoc: Makefile
Added Files:
src/external/bsd/mdocml/include: config.h
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/mdocml/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/prepare-import.sh
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/mdocml/include/config.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/lib/libmandoc/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.16 src/external/bsd/mdocml/Makefile.inc:1.17
--- src/external/bsd/mdocml/Makefile.inc:1.16 Sun Jan 5 14:49:57 2014
+++ src/external/bsd/mdocml/Makefile.inc Thu Dec 17 17:31:01 2015
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.16 2014/01/05 19:49:57 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.17 2015/12/17 22:31:01 christos Exp $
.include <bsd.own.mk>
.if (${HOSTPROG:U} == "")
-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}\"
+CPPFLAGS+= -DVERSION=\"${VERSION}\" -I${DISTDIR}/../include
.endif
DISTDIR:= ${.PARSEDIR}/dist
Index: src/external/bsd/mdocml/prepare-import.sh
diff -u src/external/bsd/mdocml/prepare-import.sh:1.7 src/external/bsd/mdocml/prepare-import.sh:1.8
--- src/external/bsd/mdocml/prepare-import.sh:1.7 Sun Jan 5 14:49:57 2014
+++ src/external/bsd/mdocml/prepare-import.sh Thu Dec 17 17:31:01 2015
@@ -4,9 +4,6 @@ set -e
rm -rf CVS ChangeLog.xsl style.css index.css *.sgml regress
-uuencode external.png < external.png > external.png.uu
-rm external.png
-
cleantags .
for f in [a-z]*; do
sed -e 's/[$]Mdocdate: \([^$]*\) \([0-9][0-9][0-9][0-9]\) [$]/\1, \2/' < $f > $f.new && mv $f.new $f
Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.7 src/external/bsd/mdocml/bin/mandoc/Makefile:1.8
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.7 Thu Mar 13 05:13:32 2014
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Thu Dec 17 17:31:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/13 09:13:32 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/12/17 22:31:01 christos Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ PROG= mandoc
SRCS= chars.c main.c out.c tree.c \
eqn_html.c eqn_term.c \
html.c man_html.c mdoc_html.c tbl_html.c \
- man_term.c mdoc_term.c term.c term_ascii.c \
+ manpath.c man_term.c mdoc_term.c term.c term_ascii.c \
term_ps.c tbl_term.c
.ifndef HOSTPROG
Index: src/external/bsd/mdocml/lib/libmandoc/Makefile
diff -u src/external/bsd/mdocml/lib/libmandoc/Makefile:1.4 src/external/bsd/mdocml/lib/libmandoc/Makefile:1.5
--- src/external/bsd/mdocml/lib/libmandoc/Makefile:1.4 Tue Oct 11 15:20:14 2011
+++ src/external/bsd/mdocml/lib/libmandoc/Makefile Thu Dec 17 17:31:01 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2011/10/11 19:20:14 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2015/12/17 22:31:01 christos 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_man.c mdoc_validate.c msec.c st.c vol.c \
+SRCS= man.c mandoc_aux.c man_hash.c man_macro.c man_validate.c \
+ att.c lib.c mdoc.c mdoc_argv.c mdoc_hash.c mdoc_macro.c \
+ mdoc_man.c mdoc_validate.c msec.c preconv.c st.c \
eqn.c roff.c tbl.c tbl_data.c tbl_layout.c tbl_opts.c \
mandoc.c read.c
MAN= mandoc.3
Added files:
Index: src/external/bsd/mdocml/include/config.h
diff -u /dev/null src/external/bsd/mdocml/include/config.h:1.1
--- /dev/null Thu Dec 17 17:31:01 2015
+++ src/external/bsd/mdocml/include/config.h Thu Dec 17 17:31:01 2015
@@ -0,0 +1,54 @@
+#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 0
+#define HAVE_MMAP 1
+#define HAVE_REALLOCARRAY 0
+#define HAVE_STRCASESTR 1
+#define HAVE_STRLCAT 1
+#define HAVE_STRLCPY 1
+#define HAVE_STRPTIME 1
+#define HAVE_STRSEP 1
+#define HAVE_STRTONUM 0
+#define HAVE_WCHAR 1
+#if 0
+#define HAVE_SQLITE3 1
+#define HAVE_SQLITE3_ERRSTR 1
+#endif
+#define HAVE_OHASH 0
+#define HAVE_MANPATH 0
+
+#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 int getsubopt(char **, char * const *, char **);
+extern void *reallocarray(void *, size_t, size_t);
+extern long long strtonum(const char *, long long, long long, const char **);
+
+#endif /* MANDOC_CONFIG_H */
