Update to 1.11.1:

The earlier libroff, libmdoc, and libman soup have been merged into
a single library, libmandoc, which manages all aspects of parsing
real manuals (from line-handling to tbl parsing).

Beyond this structural change, initial eqn functionality is in
place. For the time being, this is limited to the recognition of
equation blocks; future version of mdocml will expand upon this
framework.

As usual, many general fixes and improvements have also occured.
In particular, a great deal of redundancy and superfluous code has
been removed with the merging of the backend libraries.

5 files changed, 40 insertions, 57 deletions

diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 3c721bb273b..199f9470e32 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2011/01/13 09:39:41 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2011/04/05 09:27:31 wiz Exp $
 
-DISTNAME=		mdocml-1.10.9
+DISTNAME=		mdocml-1.11.1
 CATEGORIES=		textproc devel
 MASTER_SITES=		http://mdocml.bsd.lv/snapshots/
 
@@ -11,17 +11,4 @@ LICENSE=		2-clause-bsd # not exactly, but near enough
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man3 ${PKGMANDIR}/man7 share/examples/mandoc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mandoc ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-	${INSTALL_MAN} ${WRKSRC}/man.7 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/mandoc_man.7
-	${INSTALL_MAN} ${WRKSRC}/mandoc_char.7 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
-	${INSTALL_MAN} ${WRKSRC}/mdoc.7 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/mandoc_mdoc.7
-	${INSTALL_MAN} ${WRKSRC}/mdoc.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-	${INSTALL_MAN} ${WRKSRC}/roff.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-	${INSTALL_MAN} ${WRKSRC}/roff.7 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/mandoc_roff.7
-	${INSTALL_DATA} ${WRKSRC}/example.style.css ${DESTDIR}${PREFIX}/share/examples/mandoc/style.css
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mdocml/PLIST b/textproc/mdocml/PLIST
index 7c43ed34d5e..31953fefa55 100644
--- a/textproc/mdocml/PLIST
+++ b/textproc/mdocml/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2010/06/16 18:15:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/05 09:27:31 wiz Exp $
 bin/mandoc
-man/man3/man.3
-man/man3/mdoc.3
-man/man3/roff.3
+lib/mandoc/libmandoc.a
+man/man1/mandoc.1
+man/man3/mandoc.3
+man/man7/eqn.7
+man/man7/man.7
 man/man7/mandoc_char.7
-man/man7/mandoc_man.7
-man/man7/mandoc_mdoc.7
-man/man7/mandoc_roff.7
-share/examples/mandoc/style.css
+man/man7/mdoc.7
+man/man7/roff.7
+man/man7/tbl.7
+share/examples/mandoc/example.style.css
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index 73a5bb9abfa..d87d0f12c1a 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2011/01/13 10:14:16 wiz Exp $
+$NetBSD: distinfo,v 1.21 2011/04/05 09:27:31 wiz Exp $
 
-SHA1 (mdocml-1.10.9.tar.gz) = a8e0342912ac782a9baf0c173ca2338fafecdb1d
-RMD160 (mdocml-1.10.9.tar.gz) = 932882dace9475f72fd45e532f8fd8bb4702a9c7
-Size (mdocml-1.10.9.tar.gz) = 185048 bytes
-SHA1 (patch-aa) = c71cdc89b3dbef6f992aca4f8386b7f1a992a3f4
+SHA1 (mdocml-1.11.1.tar.gz) = b0371cf35a9ae551becc82e4308edc910cb12611
+RMD160 (mdocml-1.11.1.tar.gz) = 91491eef46ef95df8d90df3f4cc79cc3b373bbfb
+Size (mdocml-1.11.1.tar.gz) = 195346 bytes
+SHA1 (patch-Makefile) = b9838af54f7fcfe2b1a929364627cd4f9de23ac7
diff --git a/textproc/mdocml/patches/patch-Makefile b/textproc/mdocml/patches/patch-Makefile
new file mode 100644
index 00000000000..7c79009c4d0
--- /dev/null
+++ b/textproc/mdocml/patches/patch-Makefile
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile,v 1.1 2011/04/05 09:27:32 wiz Exp $
+
+Fix installation.
+
+--- Makefile.orig	2011-04-04 22:07:17.000000000 +0000
++++ Makefile
+@@ -15,7 +15,7 @@ VERSION		 = 1.11.1
+ VDATE		 = 04 April 2011
+ CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+ CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+-PREFIX		 = /usr/local
++PREFIX		?= /usr/local
+ BINDIR		 = $(PREFIX)/bin
+ INCLUDEDIR	 = $(PREFIX)/include/mandoc
+ LIBDIR		 = $(PREFIX)/lib/mandoc
+@@ -290,6 +290,7 @@ clean:
+ install: all
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
++	mkdir -p $(DESTDIR)$(LIBDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man3
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man7
diff --git a/textproc/mdocml/patches/patch-aa b/textproc/mdocml/patches/patch-aa
deleted file mode 100644
index 2afd88bc110..00000000000
--- a/textproc/mdocml/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2011/01/13 10:14:16 wiz Exp $
-
-Post-release patch from upstream fixing a core dump in pcap-save*.
-
---- tbl_data.c.orig	2011-01-07 15:07:54.000000000 +0000
-+++ tbl_data.c
-@@ -167,13 +167,19 @@ tbl_data(struct tbl_node *tbl, int ln, c
- 	/* 
- 	 * Choose a layout row: take the one following the last parsed
- 	 * span's.  If that doesn't exist, use the last parsed span's.
--	 * If there's no last parsed span, use the first row.  This can
--	 * be NULL!
-+	 * If there's no last parsed span, use the first row.  Lastly,
-+	 * if the last span was a horizontal line, use the same layout
-+	 * (it doesn't "consume" the layout).
-+	 *
-+	 * In the end, this can be NULL!
- 	 */
- 
- 	if (tbl->last_span) {
- 		assert(tbl->last_span->layout);
--		rp = tbl->last_span->layout->next;
-+		if (tbl->last_span->pos == TBL_SPAN_DATA)
-+			rp = tbl->last_span->layout->next;
-+		else
-+			rp = tbl->last_span->layout;
- 		if (NULL == rp)
- 			rp = tbl->last_span->layout;
- 	} else