summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--pkg/gen.rc2
-rw-r--r--pkg/mandoc/.gitignore2
-rw-r--r--pkg/mandoc/config.h (renamed from pkg/mdocml/config.h)1
-rw-r--r--pkg/mandoc/gen.rc (renamed from pkg/mdocml/gen.rc)11
-rw-r--r--pkg/mandoc/rev1
-rw-r--r--pkg/mandoc/sha2561
-rw-r--r--pkg/mandoc/url1
-rw-r--r--pkg/mdocml/.gitignore2
-rw-r--r--pkg/mdocml/rev1
-rw-r--r--pkg/mdocml/sha2561
-rw-r--r--pkg/mdocml/url1
-rw-r--r--sets.rc2
13 files changed, 16 insertions, 12 deletions
diff --git a/README.md b/README.md
index 7dc0bd43..712bd5f2 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ up from the following:
* [iproute2](http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2)
* [kbd](http://kbd-project.org/)
* [libressl](http://www.libressl.org/)
-* [mdocml](http://mdocml.bsd.lv/)
+* [mandoc](http://mandoc.bsd.lv/)
* [samurai](https://github.com/michaelforney/samurai) (ninja-compatible build tool)
* [openssh](http://www.openssh.com/)
* [perp](http://b0llix.net/perp/) (process supervisor)
diff --git a/pkg/gen.rc b/pkg/gen.rc
index 7c3d560e..f7edd79f 100644
--- a/pkg/gen.rc
+++ b/pkg/gen.rc
@@ -47,8 +47,8 @@ subgen lpeg
subgen lua
subgen make
subgen man-pages-posix
+subgen mandoc
subgen mc
-subgen mdocml
subgen mpv
subgen msmtp
subgen mtdev
diff --git a/pkg/mandoc/.gitignore b/pkg/mandoc/.gitignore
new file mode 100644
index 00000000..c4dbcb6b
--- /dev/null
+++ b/pkg/mandoc/.gitignore
@@ -0,0 +1,2 @@
+/mandoc-1.14.2.tar.gz
+/src
diff --git a/pkg/mdocml/config.h b/pkg/mandoc/config.h
index ccce277b..22bfba7e 100644
--- a/pkg/mdocml/config.h
+++ b/pkg/mandoc/config.h
@@ -35,4 +35,5 @@
/* paths */
#define MAN_CONF_FILE "/etc/man.conf"
+#define MANPATH_BASE "/share/man"
#define MANPATH_DEFAULT "/share/man"
diff --git a/pkg/mdocml/gen.rc b/pkg/mandoc/gen.rc
index b7c8423e..02257117 100644
--- a/pkg/mdocml/gen.rc
+++ b/pkg/mandoc/gen.rc
@@ -6,7 +6,6 @@ cflags\
lib libmandoc.a -d pkg/zlib/headers\
man.c\
- man_hash.c\
man_macro.c\
man_validate.c\
\
@@ -14,7 +13,6 @@ lib libmandoc.a -d pkg/zlib/headers\
lib.c\
mdoc.c\
mdoc_argv.c\
- mdoc_hash.c\
mdoc_macro.c\
mdoc_state.c\
mdoc_validate.c\
@@ -22,6 +20,7 @@ lib libmandoc.a -d pkg/zlib/headers\
\
eqn.c\
roff.c\
+ roff_validate.c\
tbl.c\
tbl_data.c\
tbl_layout.c\
@@ -31,6 +30,7 @@ lib libmandoc.a -d pkg/zlib/headers\
mandoc.c\
mandoc_aux.c\
mandoc_ohash.c\
+ mandoc_xr.c\
msec.c\
preconv.c\
read.c\
@@ -41,6 +41,8 @@ lib libmandoc.a -d pkg/zlib/headers\
exe mandoc\
main.c\
manpath.c\
+ mdoc_man.c\
+ mdoc_markdown.c\
out.c\
tag.c\
tree.c\
@@ -49,16 +51,17 @@ exe mandoc\
html.c\
man_html.c\
mdoc_html.c\
+ roff_html.c\
tbl_html.c\
\
- mdoc_man.c\
- \
eqn_term.c\
man_term.c\
mdoc_term.c\
+ roff_term.c\
term.c\
term_ascii.c\
term_ps.c\
+ term_tab.c\
tbl_term.c\
\
dbm.c\
diff --git a/pkg/mandoc/rev b/pkg/mandoc/rev
new file mode 100644
index 00000000..b8626c4c
--- /dev/null
+++ b/pkg/mandoc/rev
@@ -0,0 +1 @@
+4
diff --git a/pkg/mandoc/sha256 b/pkg/mandoc/sha256
new file mode 100644
index 00000000..11f2d061
--- /dev/null
+++ b/pkg/mandoc/sha256
@@ -0,0 +1 @@
+3c5562a8131697f80edbba81cdb8f6eeb5e1692388d8d2945fbbdac06ede1dfc mandoc-1.14.2.tar.gz
diff --git a/pkg/mandoc/url b/pkg/mandoc/url
new file mode 100644
index 00000000..417d96e6
--- /dev/null
+++ b/pkg/mandoc/url
@@ -0,0 +1 @@
+url = "http://mdocml.bsd.lv/snapshots/mandoc-1.14.2.tar.gz"
diff --git a/pkg/mdocml/.gitignore b/pkg/mdocml/.gitignore
deleted file mode 100644
index edcddeed..00000000
--- a/pkg/mdocml/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/mdocml-1.14.1.tar.gz
-/src
diff --git a/pkg/mdocml/rev b/pkg/mdocml/rev
deleted file mode 100644
index 00750edc..00000000
--- a/pkg/mdocml/rev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/pkg/mdocml/sha256 b/pkg/mdocml/sha256
deleted file mode 100644
index 85f5314c..00000000
--- a/pkg/mdocml/sha256
+++ /dev/null
@@ -1 +0,0 @@
-356954f141ec6f5635e938c826f2e16e4619bb361c64d84a31f6775d030a615b mdocml-1.14.1.tar.gz
diff --git a/pkg/mdocml/url b/pkg/mdocml/url
deleted file mode 100644
index ebe311b6..00000000
--- a/pkg/mdocml/url
+++ /dev/null
@@ -1 +0,0 @@
-url = "http://mdocml.bsd.lv/snapshots/mdocml-1.14.1.tar.gz"
diff --git a/sets.rc b/sets.rc
index 34b5ed14..046435e8 100644
--- a/sets.rc
+++ b/sets.rc
@@ -9,7 +9,7 @@ core=(\
kbd\
libressl\
loksh\
- mdocml\
+ mandoc\
musl\
openbsd\
openssh\