Update to 1.11.7:

02-09-2011: version 1.11.7

Added demandoc utility for stripping away macros and escapes. This
replaces the historical deroff utility. Also improved the mdoc and
man manuals.

16-08-2011: version 1.11.6

Handling of tr macro in roff implemented. This makes Perl documentation
much more readable. Hyphenation is also now enabled in man format
documents. Many other general improvements have been implemented.
Furthermore, a 64-bit Windows binary is now available at mdocml-win64.zip
and a Mac OS X universal binary is available at mdocml-macosx.zip.

24-07-2011: version 1.11.5

Significant eqn improvements. mdocml can now parse arbitrary eqn
input (although few GNU extensions are accepted, nor is mixing
low-level roff with eqn). See the eqn manual for details. For the
time being, equations are rendered as simple in-line text. The
equation parser satisfies the language specified in the Second
Edition User's Guide.

This is also the first release featuring a distributed Windows
binary, available at /binaries/mdocml-win32.zip.

12-07-2011: version 1.11.4

Bug-fixes and clean-ups across all systems, especially in makewhatis
(note: still not connected to the general build and must be compiled
with make makewhatis) and the man parser.  This release was
significantly assisted by participants in OpenBSD's c2k11.  Thanks!

26-05-2011: version 1.11.3

Introduce locale-encoding of output with the -Tlocale output option
and Unicode escaped-character input.  See mandoc and mandoc_char,
respectively, for details.  This allows for non-ASCII characters
(e.g., \[u5000]) to be rendered in the locale's encoding, if said
environment supports wide-character encoding (if it does not,
-Tascii is used instead).  Locale support can be turned off at
compile time by removing -DUSE_WCHAR in the Makefile, in which case
-Tlocale is always a synonym for -Tascii.

Furthermore, multibyte-encoded documents, such as those in UTF-8,
may be on-the-fly recoded into mandoc input by using the newly-added
preconv utility.  Note: in the future, this feature may be integrated
into mandoc.

12-05-2011: version 1.11.2

Corrected some installation issues in version 1.11.1.  Further
migration to libmandoc.  Initial public release (this utility is
very much under development) of makewhatis, initially named mandoc-db.
This utility produces keyword databases of manual content mandoc-cgi,
mandoc-tools, which features semantic querying of manual content.

4 files changed, 14 insertions, 22 deletions

diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index d8e9e9dd74b..2aceef8b4ee 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2011/04/05 12:28:57 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2011/09/06 09:49:01 wiz Exp $
 
-DISTNAME=		mdocml-1.11.1
+DISTNAME=		mdocml-1.11.7
 CATEGORIES=		textproc devel
 MASTER_SITES=		http://mdocml.bsd.lv/snapshots/
 
diff --git a/textproc/mdocml/PLIST b/textproc/mdocml/PLIST
index 31953fefa55..9098b8a50fd 100644
--- a/textproc/mdocml/PLIST
+++ b/textproc/mdocml/PLIST
@@ -1,7 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2011/04/05 09:27:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/09/06 09:49:01 wiz Exp $
+bin/demandoc
 bin/mandoc
+bin/preconv
+include/mandoc/man.h
+include/mandoc/mandoc.h
+include/mandoc/mdoc.h
 lib/mandoc/libmandoc.a
+man/man1/demandoc.1
 man/man1/mandoc.1
+man/man1/preconv.1
 man/man3/mandoc.3
 man/man7/eqn.7
 man/man7/man.7
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index 7f61d1c05cc..859d77df327 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.22 2011/04/05 12:28:57 wiz Exp $
+$NetBSD: distinfo,v 1.23 2011/09/06 09:49:01 wiz Exp $
 
-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) = 76fa4fa459654a4265fd05282ce94b81a81da684
+SHA1 (mdocml-1.11.7.tar.gz) = 2c218cffc8b4b68114ea3694700b0843a3868c50
+RMD160 (mdocml-1.11.7.tar.gz) = 26a5c46b652b9965c4c10e42d29d34f3fc49c14c
+Size (mdocml-1.11.7.tar.gz) = 225260 bytes
diff --git a/textproc/mdocml/patches/patch-Makefile b/textproc/mdocml/patches/patch-Makefile
deleted file mode 100644
index 14304fb67e9..00000000000
--- a/textproc/mdocml/patches/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2011/04/05 12:28:57 wiz Exp $
-
-Fix installation, integrated upstream.
-
---- Makefile.orig	2011-04-04 22:07:17.000000000 +0000
-+++ Makefile
-@@ -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