[pkgsrc/trunk]: pkgsrc/textproc/antiword Update to 0.36:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7cb6de9b4dcd
branches:  trunk
changeset: 484052:7cb6de9b4dcd
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Nov 23 18:20:03 2004 +0000

description:
Update to 0.36:
Bug fixes:
- Bug reported by Michael Minn <mail%michaelminn.com@localhost> 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@localhost>
- Improved table parsing. Based on information supplied by Bastien Legras
  <bastien.legras%nectech.fr@localhost> and Alex de Kruijff <freebsd%akruijff.dds.nl@localhost>
- 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@localhost>
- Better support for the Cyrillic alphabet

diffstat:

 textproc/antiword/Makefile         |   4 ++--
 textproc/antiword/distinfo         |   9 +++++----
 textproc/antiword/patches/patch-aa |  21 ++++++++++-----------
 textproc/antiword/patches/patch-ab |  13 +++++++++++++
 4 files changed, 30 insertions(+), 17 deletions(-)

diffs (108 lines):

diff -r bc1cd312a1b2 -r 7cb6de9b4dcd textproc/antiword/Makefile
--- a/textproc/antiword/Makefile        Tue Nov 23 17:32:36 2004 +0000
+++ b/textproc/antiword/Makefile        Tue Nov 23 18:20:03 2004 +0000
@@ -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 -r bc1cd312a1b2 -r 7cb6de9b4dcd textproc/antiword/distinfo
--- a/textproc/antiword/distinfo        Tue Nov 23 17:32:36 2004 +0000
+++ b/textproc/antiword/distinfo        Tue Nov 23 18:20:03 2004 +0000
@@ -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 -r bc1cd312a1b2 -r 7cb6de9b4dcd textproc/antiword/patches/patch-aa
--- a/textproc/antiword/patches/patch-aa        Tue Nov 23 17:32:36 2004 +0000
+++ b/textproc/antiword/patches/patch-aa        Tue Nov 23 18:20:03 2004 +0000
@@ -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 @@
  
  INSTALL               = cp -f
  INSTALL_PROGRAM       = $(INSTALL)
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ OPT  = -O2
  
  LDLIBS        =
  
@@ -22,8 +22,8 @@
  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 @@
 +              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 @@
        @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 @@
 -
  main_u.o:     version.h
  postscript.o: version.h
- fonts_u.o:    fontinfo.h
+ pdf.o:                version.h
diff -r bc1cd312a1b2 -r 7cb6de9b4dcd textproc/antiword/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/antiword/patches/patch-ab        Tue Nov 23 18:20:03 2004 +0000
@@ -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)