Update to 0.35:

Changes 0.34 to 0.35
--------------------
Bug fixes:
- Bug in the use of the environment variable ANTIWORDHOME
New features:
- The XML/DocBook output is slightly better.
- Scale view window is closed when the main window is closed. Thanks to Tony
  Moore <old_coaster@yahoo.co.uk> (RISC OS only)
- More support for WinWord 1.x documents

Changes 0.33 to 0.34
--------------------
Bug fixes:
- Bug in UTF-8 tables fixed
- Bug reported by Stewart Goldwater <sg@janus.freeserve.co.uk> fixed
- Bug reported by Karl-Otto Linn <linn@informatik.fh-wiesbaden.de> fixed
- Fixed a bug that made DOS hang when Antiword processed a document > 8 MB.
New features:
- Better approximations for fancy characters in the output
- A Word document can now be saved as XML/DocBook.
- Linux Makefile is now closer to conventions.
- Support for Text Boxes
- An environment variable ANTIWORDHOME was added to create a more flexable
  place for the fontnames file and the mapping files.
- Antiword is now Latin9 enabled. Thanks to Stefan Bellon
  <sbellon@sbellon.de> (RISC OS only)
- Some support for MacWord 4 and 5 documents
- More support for Word-for-DOS documents
- Support for superscripts and subscripts
- Displays slightly more images.
- Improved lists, especially in documents from Word 97 or later.

4 files changed, 28 insertions, 24 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 4f6cfa96781..7ee9ced9b6b 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:27:25 martti Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/12 22:31:55 wiz Exp $
 #
 
-DISTNAME=	antiword-0.33
+DISTNAME=	antiword-0.35
 CATEGORIES=	textproc converters print
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
diff --git a/textproc/antiword/PLIST b/textproc/antiword/PLIST
index c6baaf0bdab..0bfb4785ab2 100644
--- a/textproc/antiword/PLIST
+++ b/textproc/antiword/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/21 03:39:42 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/12 22:31:55 wiz Exp $
 bin/antiword
 bin/kantiword
 share/doc/antiword/COPYING
@@ -26,13 +26,16 @@ share/antiword/Default
 share/antiword/Example
 share/antiword/MacRoman.txt
 share/antiword/UTF-8.txt
-share/antiword/Unicode
+share/antiword/Unicode01
+share/antiword/Unicode15
 share/antiword/cp1250.txt
 share/antiword/cp1251.txt
 share/antiword/cp1252.txt
 share/antiword/cp437.txt
 share/antiword/cp850.txt
 share/antiword/cp852.txt
+share/antiword/cp862.txt
+share/antiword/cp866.txt
 share/antiword/fontnames
 share/antiword/fontnames.russian
 share/antiword/koi8-r.txt
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index 5c997d04a2f..e7a8afc4897 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/08/21 03:39:42 rh Exp $
+$NetBSD: distinfo,v 1.8 2003/12/12 22:31:55 wiz Exp $
 
-SHA1 (antiword-0.33.tar.gz) = 401e25e79a1943e53cc6c1673b72e6cb4ccd62ee
-Size (antiword-0.33.tar.gz) = 240684 bytes
-SHA1 (patch-aa) = 9c6c24fc7e5b4a783d50be46ae87296cb9cace0e
+SHA1 (antiword-0.35.tar.gz) = 9a54b49751835c03297840a1dfcb48a411fca460
+Size (antiword-0.35.tar.gz) = 272247 bytes
+SHA1 (patch-aa) = 713ec0e4659adfd75de7f3f5d7cb278369bfc3d8
diff --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa
index 851107f7991..7b477e6f82c 100644
--- a/textproc/antiword/patches/patch-aa
+++ b/textproc/antiword/patches/patch-aa
@@ -1,36 +1,38 @@
-$NetBSD: patch-aa,v 1.6 2002/08/21 03:39:42 rh Exp $
+$NetBSD: patch-aa,v 1.7 2003/12/12 22:31:55 wiz Exp $
 
---- Makefile.orig	Fri Jul  5 18:45:13 2002
+--- Makefile.orig	Wed Feb 26 21:05:47 2003
 +++ Makefile
-@@ -2,17 +2,17 @@
+@@ -2,8 +2,8 @@
  # Makefile for antiword (Linux version)
  #
  
 -CC	= gcc
 -LD	= gcc
-+CC?=gcc
-+LD=${CC}
++CC	?= gcc
++LD	= ${CC}
  
+ INSTALL		= cp -f
+ INSTALL_PROGRAM	= $(INSTALL)
+@@ -12,11 +12,11 @@ INSTALL_DATA	= $(INSTALL)
  # must be equal to DEBUG or NDEBUG
  DB	= NDEBUG
  # Optimization: -O<n> or debugging: -g
 -OPT	= -O2
-+OPT	=
++OPT	= 
  
  LDLIBS	=
  
 -CFLAGS	= -Wall -pedantic $(OPT) -D$(DB)
-+CFLAGS+= -Wall -pedantic $(OPT) -D$(DB)
++CFLAGS	+= -Wall -pedantic $(OPT) -D$(DB)
  LDFLAGS	=
  
  OBJS	=\
-@@ -25,23 +25,32 @@ OBJS	=\
- 	xmalloc.o
+@@ -29,22 +29,31 @@ OBJS	=\
+ 	worddos.o wordlib.o wordmac.o wordole.o wordwin.o xmalloc.o xml.o
  
  PROGS =\
 -	antiword\
 +	antiword
-+
 +SCRIPTS=\
  	kantiword
  
@@ -49,7 +51,6 @@ $NetBSD: patch-aa,v 1.6 2002/08/21 03:39:42 rh Exp $
 -	cp -pf $(PROGS) $(LOCAL_INSTALL_DIR)
 -	mkdir -p $(LOCAL_RESOURCES_DIR)
 -	cp -pf Resources/* $(LOCAL_RESOURCES_DIR)
--
 +		${BSD_INSTALL_PROGRAM} ${PROGS} ${GLOBAL_INSTALL_DIR}
 +		${BSD_INSTALL_SCRIPT} ${SCRIPTS} ${GLOBAL_INSTALL_DIR}
 +		${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/antiword
@@ -61,11 +62,11 @@ $NetBSD: patch-aa,v 1.6 2002/08/21 03:39:42 rh Exp $
 +		for i in Resources/* ; do				\
 +			${BSD_INSTALL_DATA} $$i ${GLOBAL_RESOURCES_DIR};\
 +		done
-+  
- # NOTE: you must be root to do this
++
+ 
+ # NOTE: you might have to be root to do this
  global_install:	all
- 	@[ `id -u` -eq 0 ] || (echo "You must be root to do this" && false)
-@@ -55,6 +64,7 @@ global_install:	all
+@@ -68,6 +77,7 @@ global_uninstall:
  clean:
  	rm -f $(OBJS)
  	rm -f $(PROGS)
@@ -73,7 +74,7 @@ $NetBSD: patch-aa,v 1.6 2002/08/21 03:39:42 rh Exp $
  
  antiword:	$(OBJS)
  	@rm -f $@
-@@ -66,9 +76,6 @@ kantiword:	Unix-only/KDE2-only/kantiword
+@@ -79,9 +89,6 @@ kantiword:	Unix-only/KDE2-only/kantiword
  	echo "#!/bin/sh" > $@
  	cat $? >> $@
  	@chmod 750 $@