Update to 1.13.2:

Changes in version 1.13.2, released on December 13, 2014

    --- MAJOR NEW FEATURES ---
 * Include an implementation of man(1), the manual page viewer.
 * Unified set of command line option, each one supported by all
   command names, including new options -a (format all), -c (no
   pager), -h (synopsis only), and -w (list filenames).
 * Support the MANPAGER and PAGER environment variables.
 * Support gzip'ed manuals by the whole toolset, even as .so targets.
 * Support UTF-8 and Latin-1 input by the whole toolset, delete preconv(1).
 * Switch the default output mode from -Tascii to -Tlocale.
 * Improve -Tascii output for Unicode escape sequences.
 * Let the -Thtml output mode produce polyglot HTML5.
 * Many improvements for eqn(7), in particular in-line equations,
   MathML output in -Thtml mode, and much improved terminal formatting.
    --- PORTABILITY IMPROVEMENTS ---
 * Change the build sequence to the usual ./configure; make; make install.
 * Support ./configure.local for build customizations.
 * Autodetect wchar, sqlite3, and manpath support.
 * Provide a fallback version of fts(3) for systems lacking it.
 * Support choosing alternative binary and manual names.
    --- MINOR NEW FEATURES ---
 * Rudimentary implementation of the e, x, and z tbl(7) layout
   modifiers to equalize, maximize, and ignore the width of columns.
 * Implement font modifiers in tbl(7) layouts.
 * Allow comma-separated options in the tbl(7) options line.
 * Parse and ignore the .pl (page length) roff(7) request.
 * Implement .An -[no]split for the mdoc(7) -Thtml output mode.
 * Support bold italic font in PostScript and PDF output.
 * Warn about commas in function arguments and parentheses in function names.
 * Warn about botched .Xr ordering and punctuation below SEE ALSO.
 * Warn about AUTHORS sections without .An macros.
 * Warn about attempts to call non-callable macros.
 * New developer documentation manual page mandoc_headers(3).
    --- BUGFIXES ---
 * Fix read buffer overrun sometimes triggered by trailing whitespace.
 * Fix read buffer overrun triggered by certain invalid \H sequences.
 * Fix NULL pointer access triggered by .Bl without any arguments.
 * Fix NULL pointer access triggered by .It Nm Fo without .Fc.
 * Fix NULL pointer access triggered by .Sh Xo .Sh without .Xc.
 * Fix NULL pointer access triggered by missing .Nm.
 * Fix an assertion triggered by .It right after .El.
 * Fix an assertion triggered by .Ec without preceding .Eo.
 * Fix an assertion triggered by .Sm or .Db with multiple arguments.
 * Fix assertion failures triggered by very large width arguments.
 * Fix a division by zero in the roff(7) parser.
 * Prevent negative arguments to .ll from causing integer underflow.
 * Correctly autodetect source format even when .Dd is preceded by .ll.
 * Multiple fixes with respect to .Bd and .Bl -offset and -width.
 * Many bugfixes with respect to scaling units.
 * Multiple fixes with respect to delimiter handling by in-line macros.
 * Multiple fixes with respect to .Pf.
 * Make \c work properly in no-fill mode.
 * Stricter syntax checking of Unicode character names.
    --- THANKS TO ---
 * Kristaps Dzonsons for rewriting the eqn(7) parser, implementing
   HTML5 and MathML output, and various other code contributions.
 * Jonathan Gray (OpenBSD) for extensive testing with afl (the
   American Fuzzy Lop security fuzzer) resulting in many bug reports.
 * Anthony Bentley (OpenBSD), Baptiste Daroussin (FreeBSD), Daniel
   Dickman, Doug Hogan, Jason McIntyre, Theo de Raadt (OpenBSD),
   and Martin Natano for source code patches.
 * Carsten Kunze (Heirloom troff), Daniel Levai (Slackware),
   Garrett D'Amore (illumos), Giovanni Becchis, Matthew Dempsky,
   Stuart Henderson, Ted Unangst, Todd Miller (OpenBSD), Thomas
   Klausner (NetBSD), Ulrich Spoerlein (FreeBSD), Justin Haynes,
   Marcus Merighi, Sebastien Marie, Steffen Nurpmeso and Theo Buehler
   for bug reports.

7 files changed, 26 insertions, 167 deletions

diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 386181fd475..7ef2a17f937 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2014/10/07 16:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.45 2014/12/13 15:52:53 wiz Exp $
 
-DISTNAME=	mdocml-1.13.1
-PKGREVISION=	1
+DISTNAME=	mdocml-1.13.2
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://mdocml.bsd.lv/snapshots/
 
@@ -10,7 +9,7 @@ HOMEPAGE=	http://mdocml.bsd.lv/
 COMMENT=	Convert man pages from mdoc, man, and tbl to txt, html, ps, or pdf
 LICENSE=	2-clause-bsd # not exactly, but near enough
 
-MAKE_FLAGS+=	PREFIX=${PREFIX}
+HAS_CONFIGURE=	yes
 
 CONFLICTS=	man-pages-[0-9]*
 
@@ -22,17 +21,14 @@ SUBST_SED.roff=		-e 's,Xr roff,Xr mandoc-roff,g'
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+post-extract:
+	${ECHO} PREFIX=${PREFIX} > ${WRKSRC}/configure.local
 # Mac OS X and Solaris 10 and newer do not support static binaries.
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
-MAKE_FLAGS+=	STATIC=
+	${ECHO} STATIC= >> ${WRKSRC}/configure.local
 .endif
 
-post-extract:
-	${CP} -p ${FILESDIR}/*.c ${WRKSRC}
-
 post-install:
-	cd ${DESTDIR}${PREFIX}/bin && mv preconv mandoc-preconv
-	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && mv preconv.1 mandoc-preconv.1
 	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7 && mv roff.7 mandoc-roff.7
 
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/textproc/mdocml/PLIST b/textproc/mdocml/PLIST
index a53007c9ba3..0d98f24cefb 100644
--- a/textproc/mdocml/PLIST
+++ b/textproc/mdocml/PLIST
@@ -1,24 +1,32 @@
-@comment $NetBSD: PLIST,v 1.11 2014/08/10 20:51:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/12/13 15:52:53 wiz Exp $
+bin/apropos
 bin/demandoc
+bin/man
 bin/mandoc
-bin/mandoc-preconv
+bin/whatis
 include/mandoc/man.h
 include/mandoc/mandoc.h
 include/mandoc/mandoc_aux.h
 include/mandoc/mdoc.h
 lib/mandoc/libmandoc.a
+man/man1/apropos.1
 man/man1/demandoc.1
-man/man1/mandoc-preconv.1
+man/man1/man.1
 man/man1/mandoc.1
+man/man1/whatis.1
 man/man3/mandoc.3
 man/man3/mandoc_escape.3
 man/man3/mandoc_malloc.3
+man/man3/mansearch.3
 man/man3/mchars_alloc.3
 man/man3/tbl.3
+man/man5/mandoc.db.5
 man/man7/eqn.7
 man/man7/man.7
 man/man7/mandoc-roff.7
 man/man7/mandoc_char.7
 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 3c8c0b7b52e..7aee7094d96 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.34 2014/08/10 20:51:01 wiz Exp $
+$NetBSD: distinfo,v 1.35 2014/12/13 15:52:53 wiz Exp $
 
-SHA1 (mdocml-1.13.1.tar.gz) = 50b12980e74eb705354775bd42a1a5d1910b8399
-RMD160 (mdocml-1.13.1.tar.gz) = f517562dac1d8cdfd3df6b2dbb2e02b175fa25e2
-Size (mdocml-1.13.1.tar.gz) = 317389 bytes
-SHA1 (patch-Makefile) = f4a62a80c7d18c71ecd18e3c0c39a7071de408c7
-SHA1 (patch-preconv.1) = 92787c58f451e1d247a25bbe136f188bf42e4c73
-SHA1 (patch-roff.7) = a975015fc4b0801f8c09c22ff4e27efdf585661a
+SHA1 (mdocml-1.13.2.tar.gz) = 0d3c4e72214f73ee81c02e9b8863db0bc8f85aaf
+RMD160 (mdocml-1.13.2.tar.gz) = 656085be209cd17738e5e7e27fcbfe375dbac5f3
+Size (mdocml-1.13.2.tar.gz) = 348464 bytes
+SHA1 (patch-roff.7) = f9e973594d14dc9189a15c99ce768572df35e4f5
diff --git a/textproc/mdocml/files/strcasestr.c b/textproc/mdocml/files/strcasestr.c
deleted file mode 100644
index 1420fa55865..00000000000
--- a/textproc/mdocml/files/strcasestr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: strcasestr.c,v 1.1 2013/12/29 19:19:03 tron Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#define	__UNCONST(a)	((void *)(unsigned long)(const void *)(a))
-
-/*
- * Find the first occurrence of find in s, ignore case.
- */
-char *
-strcasestr(const char *s, const char *find)
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != 0) {
-		c = tolower((unsigned char)c);
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-			} while ((char)tolower((unsigned char)sc) != c);
-		} while (strncasecmp(s, find, len) != 0);
-		s--;
-	}
-	return __UNCONST(s);
-}
diff --git a/textproc/mdocml/files/strsep.c b/textproc/mdocml/files/strsep.c
deleted file mode 100644
index b386453e440..00000000000
--- a/textproc/mdocml/files/strsep.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: strsep.c,v 1.1 2013/12/29 19:19:03 tron Exp $	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.  
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- */
-char *
-strsep(char **stringp, const char *delim)
-{
-	char *s;
-	const char *spanp;
-	int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
-
diff --git a/textproc/mdocml/patches/patch-Makefile b/textproc/mdocml/patches/patch-Makefile
deleted file mode 100644
index cc188cd5e0e..00000000000
--- a/textproc/mdocml/patches/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile,v 1.7 2014/08/10 20:51:01 wiz Exp $
-
-Disable apropos, makewhatis, and man.cgi until mdocml includes a
-portable fts implementation.
-
---- Makefile.orig	2014-08-10 17:26:46.000000000 +0000
-+++ Makefile
-@@ -57,7 +57,7 @@ INSTALL_MAN	 = $(INSTALL_DATA)
- # Be careful: the fts(3) implementation in glibc is broken on 32bit
- # machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838
- #
--BUILD_TARGETS	+= db-build
-+#BUILD_TARGETS	+= db-build
- 
- # The remaining settings in this section
- # are only relevant if db-build is enabled.
diff --git a/textproc/mdocml/patches/patch-roff.7 b/textproc/mdocml/patches/patch-roff.7
index 7b81de0c1eb..af09eb37d2a 100644
--- a/textproc/mdocml/patches/patch-roff.7
+++ b/textproc/mdocml/patches/patch-roff.7
@@ -1,13 +1,13 @@
-$NetBSD: patch-roff.7,v 1.4 2014/08/10 20:51:01 wiz Exp $
+$NetBSD: patch-roff.7,v 1.5 2014/12/13 15:52:53 wiz Exp $
 
-Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff.
+Install roff with 'mandoc-' prefix to avoid conflict with groff.
 
---- roff.7.orig	2014-08-08 20:40:44.000000000 +0000
+--- roff.7.orig	2014-12-13 14:06:34.000000000 +0000
 +++ roff.7
 @@ -16,10 +16,10 @@
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
- .Dd $Mdocdate: July 7 2014 $
+ .Dd $Mdocdate: December 2 2014 $
 -.Dt ROFF 7
 +.Dt MANDOC-ROFF 7
  .Os