Update antiword to 0.33.

Changes 0.32-0.33
-----------------
Bug fixes:
- Bug reported by Yannick PERRET <yperret@bat710.univ-lyon1.fr> fixed
Old features:
- The -X option is no longer supported. Replace "-X 2" by "-m 8859-2.txt"
New features:
- A little more accurate font translation
- Full support for documents from WinWord 2.0
- Some support for documents from Word-for-DOS and WinWord 1.x
- Selective header numbering.
- Implementation of stylesheets.
- The system-wide directory for the mapping files was changed from
  "/opt/antiword/share" into "/usr/share/antiword", in accordance with FHS,
  the file-system hierarchy standard. As suggested by Anand Buddhdev
  <arb@anand.org>
- Antiword now turns white text into light gray text.
- Antiword is now closer to "64-bit clean". Based on information supplied
  by Duncan Haldane <f.duncan.m.haldane@worldnet.att.net>

6 files changed, 73 insertions, 68 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index efa5e27168f..059442a7bd4 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/10/17 08:52:03 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/21 03:39:42 rh Exp $
 #
 
-DISTNAME=	antiword-0.32
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-/./}
+DISTNAME=	antiword-0.33
 CATEGORIES=	textproc print
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
@@ -12,10 +11,9 @@ COMMENT=	free converter MS Word to text and Postscript converter
 
 post-patch:
 	cd ${WRKSRC} ; \
-	${MV} antiword.h antiword.h.orig ; \
-	${SED} -e "s|@@PREFIX@@|${PREFIX}|g" antiword.h.orig > antiword.h ; \
-	${MV} Docs/antiword.1 Docs/antiword.1.orig ; \
-	${SED} -e "s|@@PREFIX@@|${PREFIX}|g" Docs/antiword.1.orig > \
-	    Docs/antiword.1
+	for pf in antiword.h Docs/antiword.1 ; do \
+	  ${MV} $${pf} $${pf}.old ; \
+	  ${SED} -e "s|/usr/share|${PREFIX}/share|g" $${pf}.old > $${pf} ; \
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/antiword/PLIST b/textproc/antiword/PLIST
index ac88645babd..c6baaf0bdab 100644
--- a/textproc/antiword/PLIST
+++ b/textproc/antiword/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/21 03:39:42 rh Exp $
 bin/antiword
 bin/kantiword
 share/doc/antiword/COPYING
@@ -13,6 +13,7 @@ share/antiword/8859-10.txt
 share/antiword/8859-13.txt
 share/antiword/8859-14.txt
 share/antiword/8859-15.txt
+share/antiword/8859-16.txt
 share/antiword/8859-2.txt
 share/antiword/8859-3.txt
 share/antiword/8859-4.txt
@@ -29,9 +30,13 @@ share/antiword/Unicode
 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/fontnames
 share/antiword/fontnames.russian
 share/antiword/koi8-r.txt
+share/antiword/koi8-u.txt
 share/antiword/roman.txt
 man/man1/antiword.1
 @dirrm share/antiword
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index 63735ca8f7a..5c997d04a2f 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2001/10/17 08:52:03 lukem Exp $
+$NetBSD: distinfo,v 1.7 2002/08/21 03:39:42 rh Exp $
 
-SHA1 (antiword-0.32.tar.gz) = e8e839fe0934e5dc7269456dec7744c463ec98d9
-Size (antiword-0.32.tar.gz) = 193697 bytes
-SHA1 (patch-aa) = 6d1dfe2907170ab4dc6d16552c157515f5956e97
-SHA1 (patch-ab) = eebff5de23991f00ecf101e8c0ab9ef5c31bf704
-SHA1 (patch-ac) = b41d4b2f517febd942d8b826910fe1ed48ccf2d1
+SHA1 (antiword-0.33.tar.gz) = 401e25e79a1943e53cc6c1673b72e6cb4ccd62ee
+Size (antiword-0.33.tar.gz) = 240684 bytes
+SHA1 (patch-aa) = 9c6c24fc7e5b4a783d50be46ae87296cb9cace0e
diff --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa
index c99ac6b2c9d..851107f7991 100644
--- a/textproc/antiword/patches/patch-aa
+++ b/textproc/antiword/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2001/10/17 08:43:25 lukem Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/21 03:39:42 rh Exp $
 
---- Makefile.orig	Sun Jul 22 05:58:03 2001
-+++ Makefile	Wed Oct 17 18:31:16 2001
-@@ -8,7 +8,7 @@
+--- Makefile.orig	Fri Jul  5 18:45:13 2002
++++ Makefile
+@@ -2,17 +2,17 @@
+ # Makefile for antiword (Linux version)
+ #
+ 
+-CC	= gcc
+-LD	= gcc
++CC?=gcc
++LD=${CC}
+ 
  # must be equal to DEBUG or NDEBUG
  DB	= NDEBUG
  # Optimization: -O<n> or debugging: -g
@@ -11,40 +19,67 @@ $NetBSD: patch-aa,v 1.5 2001/10/17 08:43:25 lukem Exp $
  
  LDLIBS	=
  
-@@ -24,20 +24,30 @@
- 	wordlib.o xmalloc.o
+-CFLAGS	= -Wall -pedantic $(OPT) -D$(DB)
++CFLAGS+= -Wall -pedantic $(OPT) -D$(DB)
+ LDFLAGS	=
+ 
+ OBJS	=\
+@@ -25,23 +25,32 @@ OBJS	=\
+ 	xmalloc.o
  
  PROGS =\
 -	antiword\
 +	antiword
-+SCRIPTS =\
++
++SCRIPTS=\
  	kantiword
  
--INSTALL_DIR = $(HOME)/bin
-+INSTALL_DIR = ${PREFIX}/bin
+ LOCAL_INSTALL_DIR = $(HOME)/bin
+ LOCAL_RESOURCES_DIR = $(HOME)/.antiword
  
--all:		$(PROGS)
-+all:		$(PROGS) $(SCRIPTS)
+-GLOBAL_INSTALL_DIR = /usr/local/bin
+-GLOBAL_RESOURCES_DIR = /usr/share/antiword
++GLOBAL_INSTALL_DIR = ${PREFIX}/bin
++GLOBAL_RESOURCES_DIR = ${PREFIX}/share/antiword
+ 
+ all:		$(PROGS)
  
  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}
+-	mkdir -p $(LOCAL_INSTALL_DIR)
+-	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
 +.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
-+		${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/antiword
++		${BSD_INSTALL_DATA_DIR} ${GLOBAL_RESOURCES_DIR}
 +		for i in Resources/* ; do				\
-+			${BSD_INSTALL_DATA} $$i ${PREFIX}/share/antiword ; \
++			${BSD_INSTALL_DATA} $$i ${GLOBAL_RESOURCES_DIR};\
 +		done
- 
++  
+ # NOTE: you must 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
  clean:
- 		rm -f $(OBJS)
--		rm -f $(PROGS)
-+		rm -f $(PROGS) $(SCRIPTS)
+ 	rm -f $(OBJS)
+ 	rm -f $(PROGS)
++	rm -f $(SCRIPTS)
  
  antiword:	$(OBJS)
- 		@rm -f $@
+ 	@rm -f $@
+@@ -66,9 +76,6 @@ kantiword:	Unix-only/KDE2-only/kantiword
+ 	echo "#!/bin/sh" > $@
+ 	cat $? >> $@
+ 	@chmod 750 $@
+-
+-.c.o:
+-	$(CC) $(CFLAGS) -c $<
+ 
+ main_u.o:	version.h
+ postscript.o:	version.h
diff --git a/textproc/antiword/patches/patch-ab b/textproc/antiword/patches/patch-ab
deleted file mode 100644
index 4a718f8ee78..00000000000
--- a/textproc/antiword/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2001/10/17 08:52:04 lukem Exp $
-
---- antiword.h.orig	Wed Sep 26 05:36:47 2001
-+++ antiword.h	Wed Oct 17 18:33:47 2001
-@@ -143,7 +143,7 @@
- #define ANTIWORD_DIR		"antiword"
- #define FONTNAMES_FILE		"fontname.txt"
- #else
--#define GLOBAL_ANTIWORD_DIR	"/opt/antiword/share"
-+#define GLOBAL_ANTIWORD_DIR	"@@PREFIX@@/share/antiword"
- #define ANTIWORD_DIR		".antiword"
- #define FONTNAMES_FILE		"fontnames"
- #endif /* __dos */
diff --git a/textproc/antiword/patches/patch-ac b/textproc/antiword/patches/patch-ac
deleted file mode 100644
index 9d55f2cfc13..00000000000
--- a/textproc/antiword/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/10/17 08:52:04 lukem Exp $
-
---- Docs/antiword.1.orig	Fri Oct  5 05:05:18 2001
-+++ Docs/antiword.1	Wed Oct 17 18:45:31 2001
-@@ -75,11 +75,11 @@
- .RE
- .SH FILES
- .TP
--$/opt/antiword/share/8859-1.txt, $HOME/.antiword/8859-1.txt and friends:
-+@@PREFIX@@/share/antiword/8859-1.txt, $HOME/.antiword/8859-1.txt and friends:
- .br
- Global and local mapping files (see -m option)
- .TP
--/opt/antiword/share/fontnames, $HOME/.antiword/fontnames:
-+@@PREFIX@@/share/antiword/fontnames, $HOME/.antiword/fontnames:
- .br
- Global and local versions of the fontnames file.
- This file contains the translation table from font names as used by MS Word to