Update to version 0.91.1 - seems to be a major rewrite.

As prodded in pkg PR 8647 by Jaromir Dolecek.
Changes from old pkgsrc version:

   0.90.1 Nov 26 1998
          Top-level Makefile now uses $MAKE instead of make
	  fixed missing end-line escaping in wordview.tcl
	  All occurences of strcpy, strcat and sprinf investigated
	  to avoid buffer overflows.
   0.90   Oct 29 1998
   	  Fixed bug with charset names redeclared locally in main()
	  Fixed problem in configure with wish 8.0.3
          Catdoc considered to be stable enough for release
   0.90b5 Oct 14 1998
          Fixed handling of 0x1F char (soft hyphen in Word 6.0),
	  now it is translated to 0x00AD (unicode soft hyphen)
	  Fixed permissions for manual page
	  Added --with-install-root configure arg to simplify
	  building of binary packages.
   0.90b4 September 17 1998
          Added proper configuration of library dir in wordview.
	  Added --disable-charset-check config option
	  Added 0x2026 symbol in ascii.rpl
	  Added more Windows codepages in distribution
   0.90b3 September 11 1998
   	  Added -x switch to simplify debugging of substitution maps
   0.90b2 September 10 1998
          Added some symbols is 0x2000-0x20FF range to substituton maps
	  These symbols occurs in cp1251 so they are frequently found
	  in Word files. Fixed some filename-handling problems in
	  wordview.tcl
   0.90b1 September 8 1998
   	  Added us-ascii.charset, fixed small bugs in confugre,
	  install is used for all installation files. Code is
	  considered stable enough to be beta.
   0.90a3 September 7 1998
          Fixed small bug in table handling, which caused catdoc to
          output extra column delimiter just before row delimiter. Added
          autoconf configuration. install is back, although not for
          charsets
   0.90a2 August 18 1998
          version 0.90 was tested on BSDI and Solaris platform. Makefile
          was rewritten to avoid use of highly incompatible
          /usr/{ucb,bin}/install
   0.90a1 August 13 1998
          Catdoc undergone major rewrite. Now it has proper charset
          handling, including UNICODE and runtime configurability.

5 files changed, 31 insertions, 45 deletions

diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 04262db53bb..b665b05ea5c 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 1999/07/02 08:37:29 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/10/21 16:54:00 agc Exp $
 #
 
-DISTNAME=	catdoc-0.35
+DISTNAME=	catdoc-0.91.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.go.dlr.de/fresh/unix/src/contrib/
 
@@ -9,14 +9,21 @@ MAINTAINER=	packages@netbsd.org
 
 DEPENDS=	tk-8.0.5:../../x11/tk80
 
-MANCOMPRESSED_IF_MANZ=	yes
+WRKSRC=		${WRKDIR}/catdoc
 
 USE_X11=	yes
+GNU_CONFIGURE=	yes
 CFLAGS+=	-Dunix
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+MANCOMPRESSED_IF_MANZ=	yes
+PLIST_SRC=	${WRKDIR}/PLIST-src
+
 post-install:
-	${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/wordview \
-		> ${PREFIX}/bin/wordview
-	chmod 755 ${PREFIX}/bin/wordview
+	${CP} ${FILESDIR}/PLIST ${PLIST_SRC}
+	${ECHO} "man/cat1/catdoc.0" >> ${PLIST_SRC}
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/catdoc/files/md5 b/textproc/catdoc/files/md5
index 3ad759dad5d..4375b70745c 100644
--- a/textproc/catdoc/files/md5
+++ b/textproc/catdoc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:39 agc Exp $
+$NetBSD: md5,v 1.3 1999/10/21 16:54:01 agc Exp $
 
-MD5 (catdoc-0.35.tar.gz) = 37f7979cd569bf61d34e3b2c4ad0603c
+MD5 (catdoc-0.91.1.tar.gz) = 6d44fb20f2fb2365fbc26e5753b4a8bf
diff --git a/textproc/catdoc/files/patch-sum b/textproc/catdoc/files/patch-sum
index 53b391db635..3a642421680 100644
--- a/textproc/catdoc/files/patch-sum
+++ b/textproc/catdoc/files/patch-sum
@@ -1,6 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:12 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/21 16:54:01 agc Exp $
 
 MD5 (patch-aa) = c9fb166485a2d62e8ea6822e2b2daf95
-MD5 (patch-ab) = af91e6b3c862f351630b75cd9f6746ed
-MD5 (patch-ac) = d3a3737ec8f42021267be78e18ae3933
-MD5 (patch-ad) = 7400d842b7500fddf7be40f028228571
+MD5 (patch-ab) = 01f9213ed1c552754471283f7265f64b
diff --git a/textproc/catdoc/patches/patch-ab b/textproc/catdoc/patches/patch-ab
index c6fd728651b..469b09d8b15 100644
--- a/textproc/catdoc/patches/patch-ab
+++ b/textproc/catdoc/patches/patch-ab
@@ -1,43 +1,25 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:14:11 agc Exp $
+$NetBSD: patch-ab,v 1.3 1999/10/21 16:54:01 agc Exp $
 
---- catdoc.1.orig	Mon Jun  8 08:57:49 1998
-+++ catdoc.1	Sat Jun 20 00:54:18 1998
-@@ -13,14 +13,14 @@
+--- doc/catdoc.1.orig	Fri Oct 15 15:30:22 1999
++++ doc/catdoc.1	Thu Oct 21 17:30:22 1999
+@@ -24,7 +24,7 @@
  but it reads MS-Word file and produces human-readable text on standard output.
  Optionally it can use 
  .BR latex (1)
 -escape sequenses for characters which have specail meaning for LaTeX.
-+escape sequenses for characters which have special meaning for LaTeX.
++escape sequences for characters which have special meaning for LaTeX.
  It also makes some effort to recognize MS-Word tables, although it never
- tries to write correct headers for LaTeX tabular environment.
- .PP
- .B catdoc
- can be invoked as filter, if you supply "-" instead of filename, but it is
--probably useless. It could be removed in future versions, becouse true
--parsing of Word file (fast saves, footnotes) requires seekable output.
-+probably useless. It could be removed in future versions, because true
-+parsing of Word files (fast saves, footnotes) requires seekable output.
- 
- .SH OPTIONS
- .TP 8
-@@ -38,7 +38,7 @@
- disables word wrapping. By default 
- .B catdoc
- output is splitted into lines not longer than 72 characters and paragraphs
--are separated by blank line. With this option each paragraph is one
-+are separated by a blank line. With this option each paragraph is one
- long line. 
- .TP 8
- .B -s 
-@@ -54,9 +54,9 @@
-  
+ tries to write correct headers for LaTeX tabular environment. Additional
+ output formats, such is HTML can be easily defined. 
+@@ -258,9 +258,9 @@
+ single quotes or hexadecimal code.
  .SH BUGS
  
 -Can produce garbage, if file contain embedded illustrations. Doesn't handle
-+Can produce garbage, if file contains embedded illustrations. Doesn't handle
++Can produce garbage, if the file contains embedded illustrations. Doesn't handle
  fast-saves properly. Prints footnotes as separate paragraphs at the end of
--file, instead of producing correct latex commands. 
-+file, instead of producing correct LaTeX commands. 
+-file, instead of producing correct latex commands. Cannot distinguish
++file, instead of producing correct LaTeX commands. Cannot distinguish
+ between empty table cell and end of table row.
  
- .SH AUTHOR
  
diff --git a/textproc/catdoc/pkg/PLIST b/textproc/catdoc/pkg/PLIST
index 5a6e32ad035..7cb7e3a4929 100644
--- a/textproc/catdoc/pkg/PLIST
+++ b/textproc/catdoc/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/06/19 23:38:18 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/10/21 16:54:01 agc Exp $
 bin/catdoc
 bin/wordview
 man/man1/catdoc.1
-man/cat1/catdoc.0