summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-07-14 15:26:42 +0000
committerwiz <wiz@pkgsrc.org>2016-07-14 15:26:42 +0000
commitca070fcd9a367a9abc67fca443c56e680d7719c8 (patch)
tree99aed6242783538561ae3d303bf0ed8b197534da
parent2112edb4053c462ad6fe5defba117030adfe026e (diff)
downloadpkgsrc-ca070fcd9a367a9abc67fca443c56e680d7719c8.tar.gz
Updated mdocml to 1.13.4.
Should fix PR 51307. Changes in version 1.13.4, released on July 14, 2016 --- MAJOR NEW FEATURES --- * man.conf(5): Design and implement a simpler configuration file format. * man(1): Leverage less(1) -T and :t in a way resembling ctags(1) to jump to the definitions of various terms inside manual pages. * soelim(1): New implementation by Baptiste Daroussin. * privilege limitation: Use OpenBSD pledge(2) or OS X sandbox_init(3) when available. * man.cgi(8): Support short URIs like http://man.openbsd.org/mdoc . * mandoc.css: Use one unified stylesheet rather than three different ones. --- MAJOR FUNCTIONALLY RELEVANT BUGFIXES --- * mdoc(7): Fix multiple aspects of SYNOPSIS .Nm formatting. * man(1): Fix process group handling, avoiding unclean shutdowns. --- PORTABILITY IMPROVEMENTS --- * Correctly use the ohash(3) compatibility implementation even when building without SQLite support. * Add compat glue for building on Solaris 9 and 10. * Let ./configure select a supported RE syntax for word boundaries. * Support LDFLAGS, to be used for example for hardening options. * Avoid mixing putchar(3) and putwchar(3) on the same file descriptor, it resulted in output corruption on some platforms. * Avoid reusing va_lists, use va_copy(3) for better portability. * Do not hardcode the path to the more(1) program. --- MINOR NEW FEATURES --- * roff(7): Implement \n(.$ (number of macro arguments). * roff(7): Fully implement \z (do not advance cursor). * roff(7): Implement the `r' conditional (register exists). * roff(7): Implement \\$* (interpolate all arguments). * roff(7): Parse and ignore \, and \/ (italic corrections). * When there is no -m, no -M, no MANPATH and no /etc/man.conf, fall back to /usr/share/man:/usr/X11R6/man:/usr/local/man. * man(1): Give manuals in purely numerical sections priority over manuals of the same name in sections with an alphabetical suffix. * man.cgi(8): Support "header.html" and "footer.html". * man.cgi(8): Set the "autofocus" attribute on the query text box. * man.cgi(8): Simplify the search form, drop two useless buttons. * man.cgi(8): Delete the pseudo-manpath "mandoc", assume that apropos(1) and man.cgi(8) are installed in the default manpath. --- RELIABILITY BUGFIXES --- * mdoc(7): Avoid a use after free and an assertion failure when nodes are deleted during validation. * mdoc(7): Avoid a NULL pointer access when .Bd has no arguments. * mdoc(7): Avoid a NULL pointer access triggered by mismatching end macros. * mdoc(7): Avoid an assertion when .Fo has no argument. * mdoc(7): Avoid an assertion when .Ta<tab> occurs in .Bl -column. * mdoc(7): Avoid an assertion when a body gets broken and has a tail. * roff(7): Avoid an assertion caused by blanks inside \o. * roff(7): Make .so links to gziped manuals work without mandoc.db(5). * tbl(7): Avoid a use after free when the last line of a layout is empty. * eqn(7): Avoid an infinite loop caused by recursive "define". * makewhatis(8): Avoid a segfault caused by unusual directory structures. * Fix handling of leading, trailing, and double colons in MANPATH and -m. --- MINOR BUGFIXES --- * mdoc(7): Put arguments to end macros of broken partial explicit blocks inside the breaking block. * mdoc(7): Let .Dv force normal font. * mdoc(7): Make trailing whitespace significant in .Bl -tag widths. * mdoc(7): Fix macro interpretation around tabs in .Bl -column. * man(7): Use the default width for .RS without arguments. * man(7): On a new RS nesting level, the saved width starts from the default width, not from the saved width of the previous level. * man(7): Allow .PD in next-line scope. * man(7): Improve handling of empty .HP. * man(7): Improve formatting of .br and .sp inside .HP. * man(7): Do not mistreat empty arguments to font alternating macros as vertical spacing requests. * man(7): Allow fill mode changes in tagged paragraph next-line scope. * man(7): Fix minor bugs in block rewinding and simplify the related code. * man(7): Add missing line breaks before subsection headers. * man(7): Give section and subsection headers hanging indentation. * man(7): Make trailing whitespace significant in .TP widths. * roff(7): Don't allow breaking the output line after hyphens that immediately follow escape sequences. * roff(7): Ignore blank characters at the beginning of conditional blocks. * roff(7): Escape breakable hyphens only after handling input line traps. * roff(7): Reject \[uD800] to \[uDFFF] (surrogates) in the parser. * tbl(7): Allow more than one data field after T} on the same input line. * terminal output: Apply bold and italic to non-ASCII Unicode codepoints. * terminal output: Improve rounding rules for horizontal scaling widths. * HTML output: Render ASCII_NBRSP as "&nbsp;", not "-". * man(1): Do not match the first part of a name if it continues with a dot. * man(1): Keep working even if the current directory is unusable. * man(1): Better error message when $PAGER is invalid. * makewhatis(8): Improve handling of .Va and .Vt macros. * apropos(1): Print "nothing appropriate" to stderr when appropriate. * apropos(1): Abort with a useful error message when elementary database operations like preparing queries or binding variables fail. --- STRUCTURAL CHANGES, no functional change --- * mdoc(7) and man(7): Unified data structures struct roff_node etc. * mdoc(7) and man(7): Unified node handling library in roff.c. * mdoc(7) and man(7): Seperate validation phase from parsing. * roff(7): Major character table cleanup. * Link with libz rather than forking gunzip(1). --- THANKS TO --- * Baptiste Daroussin (FreeBSD) for the new soelim(1) and for release testing. * Anthony Bentley (OpenBSD) for unifying mandoc.css, two nice patches for man.cgi(8), some documentation patches, some bug reports, and various useful discussions. * Todd Miller (OpenBSD) for lots of help with process group and signal handling, a few patches, some bug reports and some useful discussions. * Jonathan Gray (OpenBSD) for yet more testing with afl(1) again resulting in more than half a dozen important bug reports. * Svyatoslav Mishyn (Crux Linux) for some patches, several bug reports, and extensive release testing. * Christian Neukirchen (void Linux) for a number of compatibility patches and suggestions and several bug reports. * Christos Zoulas (NetBSD) for a bug fix patch and some useful suggestions for cleanup. * Florian Obser (OpenBSD) for a bugfix patch and some bug reports. * Sevan Janiyan for help with Solaris compatibility and release testing on many platforms. * Jan Holzhueter and OpenCSW in general for help with Solaris compatibility, and for providing me with a Solaris 9/10/11 testing environment. * Michael McConville (OpenBSD) for some simple cleanup patches. * Thomas Klausner (NetBSD) for some bug reports and release testing. * Christian Weisgerber, Dmitrij Czarkoff, Igor Sobrado, Ken Westerback, Marc Espie, Mike Belopuhov, Rafael Neves, Ted Unangst, Tim van der Molen, Theo Buehler, Theo de Raadt (OpenBSD), Kurt Jaeger, Dag Erling Smoergrav (FreeBSD), Joerg Sonnenberger (NetBSD), Carsten Kunze (Heirloom troff), Daniel Levai, Fabian Raetz, Jan Stary, Jean-Yves Migeon, Lorenzo Beretta, Markus Waldeck, Maxim Belooussov, Michael Reed, Peter Bray, and Serguey Parkhomovsky for bug reports and feature suggestions. * Alexander Hall, Andrew Fresh, Antoine Jacoutot, Doug Hogan, Jason McIntyre, Jasper Lievisse Adriaanse, Kent Spillner, Nicholas Marriott, Peter Hessler, Sebastien Marie, Stefan Sperling, and Theo de Raadt (OpenBSD) for helpful discussions and feedback.
-rw-r--r--textproc/mdocml/Makefile5
-rw-r--r--textproc/mdocml/PLIST7
-rw-r--r--textproc/mdocml/distinfo17
-rw-r--r--textproc/mdocml/patches/patch-compat_fts.c17
-rw-r--r--textproc/mdocml/patches/patch-demandoc.c12
-rw-r--r--textproc/mdocml/patches/patch-mandocdb.c12
-rw-r--r--textproc/mdocml/patches/patch-manpage.c12
-rw-r--r--textproc/mdocml/patches/patch-mansearch.c12
-rw-r--r--textproc/mdocml/patches/patch-roff.712
9 files changed, 22 insertions, 84 deletions
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 2a43d792e1a..b309af98c28 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2016/04/11 19:02:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2016/07/14 15:26:42 wiz Exp $
-DISTNAME= mdocml-1.13.3
-PKGREVISION= 5
+DISTNAME= mdocml-1.13.4
CATEGORIES= textproc devel
MASTER_SITES= http://mdocml.bsd.lv/snapshots/
diff --git a/textproc/mdocml/PLIST b/textproc/mdocml/PLIST
index 0d98f24cefb..dd3ad561183 100644
--- a/textproc/mdocml/PLIST
+++ b/textproc/mdocml/PLIST
@@ -1,18 +1,21 @@
-@comment $NetBSD: PLIST,v 1.12 2014/12/13 15:52:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/07/14 15:26:42 wiz Exp $
bin/apropos
bin/demandoc
bin/man
bin/mandoc
+bin/soelim
bin/whatis
include/mandoc/man.h
include/mandoc/mandoc.h
include/mandoc/mandoc_aux.h
include/mandoc/mdoc.h
+include/mandoc/roff.h
lib/mandoc/libmandoc.a
man/man1/apropos.1
man/man1/demandoc.1
man/man1/man.1
man/man1/mandoc.1
+man/man1/soelim.1
man/man1/whatis.1
man/man3/mandoc.3
man/man3/mandoc_escape.3
@@ -20,6 +23,7 @@ man/man3/mandoc_malloc.3
man/man3/mansearch.3
man/man3/mchars_alloc.3
man/man3/tbl.3
+man/man5/man.conf.5
man/man5/mandoc.db.5
man/man7/eqn.7
man/man7/man.7
@@ -29,4 +33,3 @@ man/man7/mdoc.7
man/man7/tbl.7
man/man8/makewhatis.8
sbin/makewhatis
-share/examples/mandoc/example.style.css
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index 77a90055d4b..adf4b98d2df 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.45 2016/04/12 08:14:50 wiz Exp $
+$NetBSD: distinfo,v 1.46 2016/07/14 15:26:42 wiz Exp $
-SHA1 (mdocml-1.13.3.tar.gz) = 3ccfbb492a477b84343c97de743b3dd5bd3c763b
-RMD160 (mdocml-1.13.3.tar.gz) = 47d1096708b45b15d8f198404fd6608d164bb66a
-SHA512 (mdocml-1.13.3.tar.gz) = a3b7304e313b905b3575d79eb7ac861723e0ef3f700199c136abe4d4c698929e99ee0789bfc6e591224fb0006c709afe0e4c1bb578605a767c371ec7dee26024
-Size (mdocml-1.13.3.tar.gz) = 358971 bytes
-SHA1 (patch-compat_fts.c) = f69ffb3b6ab4d767b1ab459d50b4572177cb9d33
-SHA1 (patch-demandoc.c) = 2ba86360ee4d4753b201415bf62f79c7c793b55c
-SHA1 (patch-mandocdb.c) = 33174512fa7862a21850cdfb57df5f0b966aa5eb
-SHA1 (patch-manpage.c) = 94610538dd60c63009a86819f261397b1444cdde
-SHA1 (patch-mansearch.c) = ac45e6a5df91434c7cc482a1b428078497788c6b
-SHA1 (patch-roff.7) = 78e19d2c2d18f4dad15b0e0f3cfbf812c0edf79b
+SHA1 (mdocml-1.13.4.tar.gz) = e7fd98e898704b8e285da3a3e2c4218694c3a51d
+RMD160 (mdocml-1.13.4.tar.gz) = 30159ed4d94aac023e1bb09cba7ca6d258d54c75
+SHA512 (mdocml-1.13.4.tar.gz) = 1d671651ca1bb81d0de86e34de8b95a3bde5b335bda03d1b83b601e26eed167af6ef8bac6f9935603e57514f2734cd8f979ed556c76db629dd5c685892d71ec2
+Size (mdocml-1.13.4.tar.gz) = 370428 bytes
+SHA1 (patch-roff.7) = fb68085cf5c68710a13ec306857760c8a583d86a
diff --git a/textproc/mdocml/patches/patch-compat_fts.c b/textproc/mdocml/patches/patch-compat_fts.c
deleted file mode 100644
index 3761873692a..00000000000
--- a/textproc/mdocml/patches/patch-compat_fts.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-compat_fts.c,v 1.7 2016/04/12 08:14:50 wiz Exp $
-
-Fix build under Solaris 10 and HP-UX.
-
---- compat_fts.c.orig 2015-03-13 12:38:38.000000000 +0000
-+++ compat_fts.c
-@@ -76,6 +76,10 @@ static int fts_safe_changedir(FTS *, FT
-
- #define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
-
-+#if defined(__sun) || defined(__hpux)
-+#define dirfd(fd) ((fd)->dd_fd)
-+#endif
-+
- FTS *
- fts_open(char * const *argv, int options, void *dummy)
- {
diff --git a/textproc/mdocml/patches/patch-demandoc.c b/textproc/mdocml/patches/patch-demandoc.c
deleted file mode 100644
index d34ca73ac18..00000000000
--- a/textproc/mdocml/patches/patch-demandoc.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-demandoc.c,v 1.1 2015/12/10 02:50:19 joerg Exp $
-
---- demandoc.c.orig 2015-12-07 15:20:07.413956576 +0000
-+++ demandoc.c
-@@ -20,7 +20,6 @@
-
- #include <assert.h>
- #include <ctype.h>
--#include <getopt.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/textproc/mdocml/patches/patch-mandocdb.c b/textproc/mdocml/patches/patch-mandocdb.c
deleted file mode 100644
index a0348753048..00000000000
--- a/textproc/mdocml/patches/patch-mandocdb.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-mandocdb.c,v 1.7 2015/12/10 02:50:19 joerg Exp $
-
---- mandocdb.c.orig 2015-12-07 15:20:09.513956486 +0000
-+++ mandocdb.c
-@@ -30,7 +30,6 @@
- #else
- #include "compat_fts.h"
- #endif
--#include <getopt.h>
- #include <limits.h>
- #include <stddef.h>
- #include <stdio.h>
diff --git a/textproc/mdocml/patches/patch-manpage.c b/textproc/mdocml/patches/patch-manpage.c
deleted file mode 100644
index 6b01f5d1132..00000000000
--- a/textproc/mdocml/patches/patch-manpage.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-manpage.c,v 1.1 2015/12/10 02:50:19 joerg Exp $
-
---- manpage.c.orig 2015-12-07 15:20:30.565955584 +0000
-+++ manpage.c
-@@ -20,7 +20,6 @@
- #include <sys/types.h>
-
- #include <assert.h>
--#include <getopt.h>
- #include <limits.h>
- #include <stdint.h>
- #include <stdio.h>
diff --git a/textproc/mdocml/patches/patch-mansearch.c b/textproc/mdocml/patches/patch-mansearch.c
deleted file mode 100644
index e08b61bd403..00000000000
--- a/textproc/mdocml/patches/patch-mansearch.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-mansearch.c,v 1.1 2015/12/10 02:50:19 joerg Exp $
-
---- mansearch.c.orig 2015-12-07 15:20:30.565955584 +0000
-+++ mansearch.c
-@@ -23,7 +23,6 @@
- #include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <getopt.h>
- #include <glob.h>
- #include <limits.h>
- #include <regex.h>
diff --git a/textproc/mdocml/patches/patch-roff.7 b/textproc/mdocml/patches/patch-roff.7
index e9735fe2fe2..c208ae9890e 100644
--- a/textproc/mdocml/patches/patch-roff.7
+++ b/textproc/mdocml/patches/patch-roff.7
@@ -1,13 +1,19 @@
-$NetBSD: patch-roff.7,v 1.7 2015/07/19 19:19:10 joerg Exp $
+$NetBSD: patch-roff.7,v 1.8 2016/07/14 15:26:42 wiz Exp $
Install roff with 'mandoc-' prefix to avoid conflict with groff.
---- roff.7.orig 2015-03-13 12:38:38.000000000 +0000
+--- roff.7.orig 2016-07-09 11:15:54.000000000 +0000
+++ roff.7
-@@ -19,4 +19,4 @@
+@@ -16,10 +16,10 @@
+ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ .\"
+ .Dd $Mdocdate: September 24 2015 $
-.Dt ROFF 7
+.Dt MANDOC-ROFF 7
.Os
.Sh NAME
-.Nm roff
+.Nm mandoc-roff
+ .Nd roff language reference for mandoc
+ .Sh DESCRIPTION
+ The