Update to antiword 0.31. ChangeLog:

Changes 0.30-0.31
-----------------
Bug fixes:
- Bug in the "Show hidden (by Word) text" feature fixed
- Bug reported by David Aspinwall <aspinwall@timesten.com> fixed
- Bug reported by Robert Steinmetz <rob@steinmetznet.com> fixed
Old features:
- The -g and -c options are no longer supported. The -c option was default
  and is now used automatically (Unix only)
New features:
- Ability to show part of the images.
- Ability to use landscape mode (Unix only; PostScript version only)
- Support for all ISO-8859 character sets plus KOI8 and some code pages
  (Unix only; text version only)
- Antiword will now give a warning if the given Postscript papersize is
  unsupported. Thanks to Greg Robinson <Greg.Robinson@dsto.defence.gov.au>
- Moved from Postscript version 1 to version 2
- Antiword now returns 1 if no Word document is found among the files given
  on the command-line. As suggested by Jens Schleusener
  <Jens.Schleusener@dlr.de>
- Takes the right margin into account.
- The PostScript part now supports the AvantGarde, Bookman, Helvetica-Narrow,
  NewCenturySchlbk and Palatino font (Unix only)
- More accurate fontnames translation table

5 files changed, 45 insertions, 16 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 6ff49ab6ccd..080cb6fbe1f 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/06/13 00:12:10 simonb Exp $
 #
 
-DISTNAME=	antiword-0.30
+DISTNAME=	antiword-0.31
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-/./}
 CATEGORIES=	textproc print
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index 3b5a409f19c..b4b8c7076c4 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 15:04:54 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/06/13 00:12:10 simonb Exp $
 
-SHA1 (antiword-0.30.tar.gz) = 768cd4fe241ceba7f98a5195473b0f094845ddd5
-Size (antiword-0.30.tar.gz) = 92331 bytes
-SHA1 (patch-aa) = 63cf523ece4bb83a4fcf45c1ea02d41e7c5a37b4
+SHA1 (antiword-0.31.tar.gz) = 19a2d0086365e914c032fc6af0bd438fdf8cf349
+Size (antiword-0.31.tar.gz) = 170145 bytes
+SHA1 (patch-aa) = 4d97947e46bd8abf40309f0283ab21e35a91fde5
+SHA1 (patch-ab) = 1140b5cca05e13deb030b5535a4c13a4580fe31d
diff --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa
index 53f869668ec..08917341524 100644
--- a/textproc/antiword/patches/patch-aa
+++ b/textproc/antiword/patches/patch-aa
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.2 2000/08/04 13:11:41 agc Exp $
-
---- Makefile	2000/08/02 10:33:55	1.1
-+++ Makefile	2000/08/02 10:34:31
+--- Makefile.orig	Tue Dec  5 06:58:28 2000
++++ Makefile	Wed Jun 13 10:02:47 2001
 @@ -10,7 +10,7 @@
  
  LDLIBS	=
@@ -11,22 +9,36 @@ $NetBSD: patch-aa,v 1.2 2000/08/04 13:11:41 agc Exp $
  LDFLAGS	=
  
  OBJS	=\
-@@ -22,12 +22,16 @@
+@@ -21,20 +21,26 @@
+ 	tabstop.o unix.o word2text.o wordlib.o xmalloc.o
+ 
  PROGS =\
- 	antiword
+-	antiword\
++	antiword
++SCRIPTS =\
+ 	kantiword
  
 -INSTALL_DIR = $(HOME)/bin
 +INSTALL_DIR = ${PREFIX}/bin
  
- all:		$(PROGS)
+-all:		$(PROGS)
++all:		$(PROGS) $(SCRIPTS)
  
  install:	all
+-		[ -d $(INSTALL_DIR) ] || mkdir $(INSTALL_DIR)
 -		cp -pf $(PROGS) $(INSTALL_DIR)
 +		${BSD_INSTALL_PROGRAM} ${PROGS} ${INSTALL_DIR}
++		${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${INSTALL_DIR}
 +		${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/antiword
-+.for file in COPYING Changes History QandA ReadMe
++.for file in COPYING ChangeLog FAQ History Netscape QandA ReadMe
 +		${BSD_INSTALL_DATA} Docs/${file} ${PREFIX}/share/doc/antiword
 +.endfor
++		${BSD_INSTALL_MAN} Docs/antiword.1 ${PREFIX}/man/man1/antiword.1
  
  clean:
  		rm -f $(OBJS)
+-		rm -f $(PROGS)
++		rm -f $(PROGS) $(SCRIPTS)
+ 
+ antiword:	$(OBJS)
+ 		@rm -f $@
diff --git a/textproc/antiword/patches/patch-ab b/textproc/antiword/patches/patch-ab
new file mode 100644
index 00000000000..1ae128dbfc2
--- /dev/null
+++ b/textproc/antiword/patches/patch-ab
@@ -0,0 +1,12 @@
+--- antiword.h.orig	Thu Nov 30 06:54:14 2000
++++ antiword.h	Wed Jun 13 10:04:21 2001
+@@ -41,7 +41,9 @@
+  #endif /* __riscos */
+ #endif /* !PATH_MAX */
+ 
++#ifndef SIZE_T_MAX
+ #define SIZE_T_MAX		(size_t)UINT_MAX
++#endif
+ 
+ #if defined(__riscos)
+ #define FILE_SEPARATOR		"."
diff --git a/textproc/antiword/pkg/PLIST b/textproc/antiword/pkg/PLIST
index 57325a3a97b..d635d9812fc 100644
--- a/textproc/antiword/pkg/PLIST
+++ b/textproc/antiword/pkg/PLIST
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/05 13:53:50 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/06/13 00:12:11 simonb Exp $
 bin/antiword
+bin/kantiword
 share/doc/antiword/COPYING
-share/doc/antiword/Changes
+share/doc/antiword/ChangeLog
+share/doc/antiword/FAQ
 share/doc/antiword/History
+share/doc/antiword/Netscape
 share/doc/antiword/QandA
 share/doc/antiword/ReadMe
+man/man1/antiword.1
 @dirrm share/doc/antiword