Update to 0.36:

Bug fixes:
- Bug reported by Michael Minn <mail@michaelminn.com> fixed
New features:
- The default mapping file is now based on the locale (Unix/Linux) or on
  the active codepage (DOS)
- A Word document can now be saved as "formatted" text. That means with things
  like *bold* to show bold text, /italics/ to show italics and _undeline_ to
  show underlined text are added to the plain text. Based on patches send by
  Ofir Reichenberg <ofir@qlusters.com>
- Improved table parsing. Based on information supplied by Bastien Legras
  <bastien.legras@nectech.fr> and Alex de Kruijff <freebsd@akruijff.dds.nl>
- A Word document can now be saved in PDF.
- First attempt to support PostScript output in the Cyrillic alphabet. Based
  on work done by Alexander Belyaev <isle@free.kursknet.ru>
- Better support for the Cyrillic alphabet

4 files changed, 30 insertions, 17 deletions

diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 7ee9ced9b6b..3f2c787972f 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/12/12 22:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/23 18:20:03 wiz Exp $
 #
 
-DISTNAME=	antiword-0.35
+DISTNAME=	antiword-0.36
 CATEGORIES=	textproc converters print
 MASTER_SITES=	http://www.winfield.demon.nl/linux/
 
diff --git a/textproc/antiword/distinfo b/textproc/antiword/distinfo
index 14e40ca1046..7637112dd72 100644
--- a/textproc/antiword/distinfo
+++ b/textproc/antiword/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2004/08/20 09:14:19 sketch Exp $
+$NetBSD: distinfo,v 1.10 2004/11/23 18:20:03 wiz Exp $
 
-SHA1 (antiword-0.35.tar.gz) = 9a54b49751835c03297840a1dfcb48a411fca460
-Size (antiword-0.35.tar.gz) = 272247 bytes
-SHA1 (patch-aa) = 31929a30dc674b7a4b0aa9e592f0def3728da10d
+SHA1 (antiword-0.36.tar.gz) = c63c967f38c85b530e816ee4b264894e74fae5bb
+Size (antiword-0.36.tar.gz) = 292666 bytes
+SHA1 (patch-aa) = b012848f3cab517d52aede692740604aefd09d7c
+SHA1 (patch-ab) = e4c25992cc6406b27e12986733064661dd072001
diff --git a/textproc/antiword/patches/patch-aa b/textproc/antiword/patches/patch-aa
index a77788d8db0..a9195e37102 100644
--- a/textproc/antiword/patches/patch-aa
+++ b/textproc/antiword/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2004/08/20 09:14:19 sketch Exp $
+$NetBSD: patch-aa,v 1.9 2004/11/23 18:20:03 wiz Exp $
 
---- Makefile.orig	Wed Feb 26 20:05:47 2003
-+++ Makefile	Fri Aug 20 10:05:22 2004
+--- Makefile.orig	2004-10-21 20:13:03.000000000 +0200
++++ Makefile
 @@ -2,8 +2,8 @@
  # Makefile for antiword (Linux version)
  #
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.8 2004/08/20 09:14:19 sketch Exp $
  
  INSTALL		= cp -f
  INSTALL_PROGRAM	= $(INSTALL)
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ OPT	= -O2
  
  LDLIBS	=
  
@@ -22,8 +22,8 @@ $NetBSD: patch-aa,v 1.8 2004/08/20 09:14:19 sketch Exp $
  LDFLAGS	=
  
  OBJS	=\
-@@ -29,23 +29,32 @@
- 	worddos.o wordlib.o wordmac.o wordole.o wordwin.o xmalloc.o xml.o
+@@ -30,22 +30,31 @@ OBJS	=\
+ 	xmalloc.o xml.o
  
  PROGS =\
 -	antiword\
@@ -57,12 +57,11 @@ $NetBSD: patch-aa,v 1.8 2004/08/20 09:14:19 sketch Exp $
 +		for i in Resources/* ; do				\
 +			${BSD_INSTALL_DATA} $$i ${GLOBAL_RESOURCES_DIR};\
 +		done
- 
 +
+ 
  # 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)
-@@ -68,10 +77,11 @@
+@@ -70,10 +79,11 @@ global_uninstall:
  clean:
  	rm -f $(OBJS)
  	rm -f $(PROGS)
@@ -75,7 +74,7 @@ $NetBSD: patch-aa,v 1.8 2004/08/20 09:14:19 sketch Exp $
  	@chmod 750 $@
  
  kantiword:	Unix-only/KDE2-only/kantiword.sh
-@@ -80,9 +90,6 @@
+@@ -82,9 +92,6 @@ kantiword:	Unix-only/KDE2-only/kantiword
  	cat $? >> $@
  	@chmod 750 $@
  
@@ -84,4 +83,4 @@ $NetBSD: patch-aa,v 1.8 2004/08/20 09:14:19 sketch Exp $
 -
  main_u.o:	version.h
  postscript.o:	version.h
- fonts_u.o:	fontinfo.h
+ pdf.o:		version.h
diff --git a/textproc/antiword/patches/patch-ab b/textproc/antiword/patches/patch-ab
new file mode 100644
index 00000000000..dc1593aca84
--- /dev/null
+++ b/textproc/antiword/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.6 2004/11/23 18:20:03 wiz Exp $
+
+--- main_u.c.orig	2004-10-14 18:49:18.000000000 +0200
++++ main_u.c
+@@ -29,7 +29,7 @@
+ #include <fcntl.h>
+ #include <io.h>
+ #endif /* __dos */
+-#if defined(__STDC_ISO_10646__)
++#if defined(__STDC_ISO_10646__) || defined(__NetBSD__)
+ #include <locale.h>
+ #endif /* __STDC_ISO_10646__ */
+ #if defined(N_PLAT_NLM)