mdocml: Update to 1.13.4

6 files changed, 36 insertions, 25 deletions

diff --git a/core/mdocml/.gitignore b/core/mdocml/.gitignore
index 4ed69605..0da61be7 100644
--- a/core/mdocml/.gitignore
+++ b/core/mdocml/.gitignore
@@ -1,2 +1,2 @@
-/mdocml-1.13.3.tar.gz
+/mdocml-1.13.4.tar.gz
 /src
diff --git a/core/mdocml/config.h b/core/mdocml/config.h
index 63cd56ba..d6aa80df 100644
--- a/core/mdocml/config.h
+++ b/core/mdocml/config.h
@@ -1,26 +1,26 @@
 #include <config-posix.h>
-#define HAVE_WCHAR 1
-
-/* features */
-#define HAVE_MANPATH 0
-#define HAVE_SQLITE3 0
-/* #undef HAVE_SQLITE3_ERRSTR */ /* only used DB support */
-/* #undef HAVE_OHASH */ /* only used DB support */
 
-/* types */
-#define DIRENT_NAMLEN 0
-
-/* functions */
-#define HAVE_FGETLN 1
+#define HAVE_DIRENT_NAMLEN 0
+#define HAVE_ERR 1
+#define HAVE_FTS 1
+#define HAVE_PLEDGE 0
+#define HAVE_PROGNAME 0
+#define HAVE_REALLOCARRAY 1
+#define HAVE_REWB_BSD 0
+#define HAVE_REWB_SYSV 1
+#define HAVE_SANDBOX_INIT 0
 #define HAVE_STRCASESTR 1
+#define HAVE_STRINGLIST 0
 #define HAVE_STRLCAT 1
 #define HAVE_STRLCPY 1
 #define HAVE_STRSEP 1
-
-/* get these from OpenBSD */
-#define HAVE_FTS 1
-#define HAVE_REALLOCARRAY 1
 #define HAVE_STRTONUM 1
+#define HAVE_VASPRINTF 1
+#define HAVE_WCHAR 1
+#define HAVE_SQLITE3 0
+#define HAVE_SQLITE3_ERRSTR 0
+#define HAVE_OHASH 0
+#define HAVE_MANPATH 0
 
 /* macros */
 #if !defined(__BEGIN_DECLS)
@@ -35,3 +35,7 @@
 #define BINM_MAN "man"
 #define BINM_WHATIS "whatis"
 #define BINM_MAKEWHATIS "makewhatis"
+
+/* paths */
+#define MAN_CONF_FILE "/etc/man.conf"
+#define MANPATH_DEFAULT "/share/man"
diff --git a/core/mdocml/gen.rc b/core/mdocml/gen.rc
index 1d1c7516..9ecace70 100644
--- a/core/mdocml/gen.rc
+++ b/core/mdocml/gen.rc
@@ -1,9 +1,10 @@
 cflags\
 	-I core/openbsd/include\
+	-I '$builddir'/core/zlib/include\
 	-I include\
 	-I '$dir'
 
-lib libmandoc.a\
+lib libmandoc.a -d phony/core/zlib/headers\
 	man.c\
 	man_hash.c\
 	man_macro.c\
@@ -15,6 +16,7 @@ lib libmandoc.a\
 	mdoc_argv.c\
 	mdoc_hash.c\
 	mdoc_macro.c\
+	mdoc_state.c\
 	mdoc_validate.c\
 	st.c\
 	\
@@ -28,14 +30,19 @@ lib libmandoc.a\
 	chars.c\
 	mandoc.c\
 	mandoc_aux.c\
+	mandoc_ohash.c\
 	msec.c\
 	preconv.c\
-	read.c
+	read.c\
+	\
+	compat_ohash.c\
+	compat_progname.c
 
 exe mandoc\
 	main.c\
 	manpath.c\
 	out.c\
+	tag.c\
 	tree.c\
 	\
 	eqn_html.c\
@@ -54,12 +61,12 @@ exe mandoc\
 	term_ps.c\
 	tbl_term.c\
 	libmandoc.a\
-	'$builddir'/core/openbsd/libbsd.a
-exe demandoc demandoc.c libmandoc.a '$builddir'/core/openbsd/libbsd.a
+	'$builddir'/^(core/openbsd/libbsd.a core/zlib/libz.a)
+exe demandoc demandoc.c libmandoc.a '$builddir'/^(core/openbsd/libbsd.a core/zlib/libz.a)
 
 for(exe in mandoc demandoc) file bin/$exe '$outdir'/$exe 755
 sym bin/man mandoc
-for(man in mandoc.1 demandoc.1 man.1 mandoc.3 man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7) {
+for(man in mandoc.1 demandoc.1 man.1 mandoc.3 man.conf.5 man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7) {
 	sect=`{printf %s $man | tail -c 1}
 	file share/man/man$sect/$man '$srcdir'/$man 644
 }
diff --git a/core/mdocml/rev b/core/mdocml/rev
index d00491fd..0cfbf088 100644
--- a/core/mdocml/rev
+++ b/core/mdocml/rev
@@ -1 +1 @@
-1
+2
diff --git a/core/mdocml/sha256 b/core/mdocml/sha256
index 93e9d07a..13446bd9 100644
--- a/core/mdocml/sha256
+++ b/core/mdocml/sha256
@@ -1 +1 @@
-23ccab4800d50bf4c327979af5d4aa1a6a2dc490789cb67c4c3ac1bd40b8cad8  mdocml-1.13.3.tar.gz
+0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef  mdocml-1.13.4.tar.gz
diff --git a/core/mdocml/url b/core/mdocml/url
index 2950bda8..46ea2f7b 100644
--- a/core/mdocml/url
+++ b/core/mdocml/url
@@ -1 +1 @@
-url = "http://mdocml.bsd.lv/snapshots/mdocml-1.13.3.tar.gz"
+url = "http://mdocml.bsd.lv/snapshots/mdocml-1.13.4.tar.gz"