14 files changed, 71 insertions, 145 deletions
diff --git a/textproc/catdoc-tk/DESCR b/textproc/catdoc-tk/DESCR
index 4977baf5ab2..7d7ad38f378 100644
--- a/textproc/catdoc-tk/DESCR
+++ b/textproc/catdoc-tk/DESCR
@@ -1,10 +1,5 @@
-catdoc behaves much like cat(1) but reads MS-Word file and
-produces  human-readable text on standard output.  Option-
-ally it can use latex(1) escape sequences  for  characters
-which  have special meaning for LaTeX.  It also makes some
-effort to recognize  MS-Word  tables,  although  it  never
-tries  to write correct headers for LaTeX tabular environ-
-ment.
+This package provides the wordview program that comes with catdoc,
+which requires Tk and X11.
 
-This package provides the wordview program that comes with
-catdoc, which requires Tk and X11.
+The wordview program is simple GUI wrapper around catdoc(1) which
+allows browsing through a Word file interactively.
diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile
index 50f0c42b5f5..affb1c51cb6 100644
--- a/textproc/catdoc-tk/Makefile
+++ b/textproc/catdoc-tk/Makefile
@@ -1,23 +1,25 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:11:00 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/24 17:07:00 reed Exp $
 #
 
 .include "../../textproc/catdoc/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/catdoc/catdoc-tk/}
-PKGREVISION=		1
-COMMENT+=		(Tk interface)
+COMMENT=		Reads MS-Word file and puts out its content as plain text (Tk interface)
 
 DEPENDS+=		catdoc>=0.91.4nb1:../../textproc/catdoc
 
-
 CONFIGURE_ARGS+=	--enable-wordview
 CONFIGURE_ENV+=		WISH="${BUILDLINK_PREFIX.tk}/bin/wish"
 CONFIGURE_ENV+=		enable_wordview=yes
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+do-build:
+	cd ${WRKSRC}/src && ${MAKE} wordview
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/wordview ${PREFIX}/bin/wordview
+	${INSTALL_MAN} ${WRKSRC}/doc/wordview.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/catdoc-tk/PLIST b/textproc/catdoc-tk/PLIST
index 49bdb56b564..2da37bdc0e6 100644
--- a/textproc/catdoc-tk/PLIST
+++ b/textproc/catdoc-tk/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/17 14:58:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/24 17:07:00 reed Exp $
 bin/wordview
+man/man1/wordview.1
diff --git a/textproc/catdoc/DESCR b/textproc/catdoc/DESCR
index 2d9c2f01155..b274e0a3b4b 100644
--- a/textproc/catdoc/DESCR
+++ b/textproc/catdoc/DESCR
@@ -1,7 +1,15 @@
-catdoc behaves much like cat(1) but reads MS-Word file and
-produces  human-readable text on standard output.  Option-
-ally it can use latex(1) escape sequences  for  characters
-which  have special meaning for LaTeX.  It also makes some
-effort to recognize  MS-Word  tables,  although  it  never
-tries  to write correct headers for LaTeX tabular environ-
-ment.
+catdoc behaves much like cat(1) but reads MS-Word file and produces
+human-readable text on standard output.  Optionally it can use
+latex(1) escape sequences for characters which have special meaning
+for LaTeX.  It also makes some effort to recognize MS-Word tables,
+although it never tries to write correct headers for LaTeX tabular
+environment.
+
+This package also includes catppt and xls2cvs.  The catppt utility
+reads MS-PowerPoint presentations and outputs its content to stdout.
+The xls2csv utility reads MS-Excel spreadsheets and outputs its
+content as comma-separated values to stdout. Numbers are printed
+without delimiters and strings are enclosed in the double quotes.
+Double-quotes inside string are doubled.
+
+
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index beaf5f66387..1fab2c3fd14 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/12/28 04:40:46 reed Exp $
+# $NetBSD: Makefile,v 1.28 2007/01/24 17:07:00 reed Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	2
-
 CONFIGURE_ARGS+=	--disable-wordview
 CONFIGURE_ENV+=		enable_wordview=no
 CONFIGURE_ENV+=		man1dir=${PREFIX}/${PKGMANDIR}/man1
diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common
index c5486757ef9..db5e1a5fe56 100644
--- a/textproc/catdoc/Makefile.common
+++ b/textproc/catdoc/Makefile.common
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile.common,v 1.8 2007/01/23 17:45:02 obache Exp $
+# $NetBSD: Makefile.common,v 1.9 2007/01/24 17:07:00 reed Exp $
 #
 
-DISTNAME=	catdoc-0.91.4
+DISTNAME=	catdoc-0.94.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://ftp.45.free.net/pub/catdoc/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.45.free.net/~vitus/software/catdoc/
-COMMENT=	Reads MS-Word file and puts out its content as plain text
+COMMENT=	Converts MS Word, Excel and Powerpoint files to plain text
 
 DISTINFO_FILE=		${.CURDIR}/../../textproc/catdoc/distinfo
 PATCHDIR=		${.CURDIR}/../../textproc/catdoc/patches
 
-WRKSRC=			${WRKDIR}/catdoc
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
diff --git a/textproc/catdoc/PLIST b/textproc/catdoc/PLIST
index 7869669c61e..c8a65662357 100644
--- a/textproc/catdoc/PLIST
+++ b/textproc/catdoc/PLIST
@@ -1,9 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/17 14:57:27 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/01/24 17:07:00 reed Exp $
 bin/catdoc
+bin/catppt
 bin/xls2csv
-bin/xlsview
 man/man1/catdoc.1
+man/man1/catppt.1
+man/man1/xls2csv.1
 share/catdoc/8859-1.txt
+share/catdoc/8859-10.txt
+share/catdoc/8859-11.txt
+share/catdoc/8859-13.txt
+share/catdoc/8859-14.txt
+share/catdoc/8859-15.txt
 share/catdoc/8859-2.txt
 share/catdoc/8859-3.txt
 share/catdoc/8859-4.txt
@@ -39,8 +46,13 @@ share/catdoc/cp869.txt
 share/catdoc/cp874.txt
 share/catdoc/koi8-r.txt
 share/catdoc/koi8-u.txt
+share/catdoc/mac-arabic.txt
+share/catdoc/mac-centeuro.txt
+share/catdoc/mac-cyrillic.txt
+share/catdoc/mac-greek.txt
+share/catdoc/mac-hebrew.txt
+share/catdoc/mac-roman.txt
 share/catdoc/tex.replchars
 share/catdoc/tex.specchars
 share/catdoc/us-ascii.txt
-share/catdoc/x-mac-cyrillic.txt
 @dirrm share/catdoc
diff --git a/textproc/catdoc/distinfo b/textproc/catdoc/distinfo
index 1a50c589f9a..a68c666229c 100644
--- a/textproc/catdoc/distinfo
+++ b/textproc/catdoc/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.7 2006/10/01 08:58:24 schwarz Exp $
+$NetBSD: distinfo,v 1.8 2007/01/24 17:07:00 reed Exp $
 
-SHA1 (catdoc-0.91.4.tar.gz) = f486345447993bc818093f84b505c2ebbb046954
-RMD160 (catdoc-0.91.4.tar.gz) = 6519112a49c495c2b2fcee442c841d1ee23e9970
-Size (catdoc-0.91.4.tar.gz) = 128428 bytes
-SHA1 (patch-aa) = c9b4834bdd9ce734320dc6cc1077037de007308b
-SHA1 (patch-ab) = 328c6d3f1613dff35760836bf051c48fba343576
-SHA1 (patch-ac) = 30d9873a3360b4153ab2c5ff4dc867fc076870fd
-SHA1 (patch-ad) = 8c31913ccee50b7f1b26b7a2f0ab48ae9368cadd
-SHA1 (patch-ae) = e088cd6ca202a6d201ff6f7d93a98dc1c712f3c0
-SHA1 (patch-af) = d813dbbadd7749b80aa7bab47d8b963ad41cc1fc
+SHA1 (catdoc-0.94.2.tar.gz) = 50ce9d7cb24ad6b10a856c9c24183e2b0a11ca04
+RMD160 (catdoc-0.94.2.tar.gz) = 59eb7a026fd3a2dae74a3e7f01a58266f7efaf72
+Size (catdoc-0.94.2.tar.gz) = 146012 bytes
+SHA1 (patch-ac) = 573aad7759f1975e27216023f45663c2a17febff
+SHA1 (patch-af) = 2441e50fcb3c829c39d3f62086e871701d735df2
diff --git a/textproc/catdoc/patches/patch-aa b/textproc/catdoc/patches/patch-aa
deleted file mode 100644
index 823888b6120..00000000000
--- a/textproc/catdoc/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/27 18:38:00 reed Exp $
-
---- Makefile.orig	Sat Jun 20 01:09:18 1998
-+++ Makefile	Sat Jun 20 01:13:08 1998
-@@ -0,0 +1,6 @@
-+PROG=		catdoc
-+
-+MANINSTALL=	catinstall maninstall
-+BINDIR=		$(LOCALBASE)/bin
-+MANDIR=		@mandir@
-+.include <bsd.prog.mk>
diff --git a/textproc/catdoc/patches/patch-ab b/textproc/catdoc/patches/patch-ab
deleted file mode 100644
index 469b09d8b15..00000000000
--- a/textproc/catdoc/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/10/21 16:54:01 agc Exp $
-
---- doc/catdoc.1.orig	Fri Oct 15 15:30:22 1999
-+++ doc/catdoc.1	Thu Oct 21 17:30:22 1999
-@@ -24,7 +24,7 @@
- but it reads MS-Word file and produces human-readable text on standard output.
- Optionally it can use 
- .BR latex (1)
--escape sequenses for characters which have specail meaning for LaTeX.
-+escape sequences for characters which have special meaning for LaTeX.
- It also makes some effort to recognize MS-Word tables, although it never
- tries to write correct headers for LaTeX tabular environment. Additional
- output formats, such is HTML can be easily defined. 
-@@ -258,9 +258,9 @@
- single quotes or hexadecimal code.
- .SH BUGS
- 
--Can produce garbage, if file contain embedded illustrations. Doesn't handle
-+Can produce garbage, if the file contains embedded illustrations. Doesn't handle
- fast-saves properly. Prints footnotes as separate paragraphs at the end of
--file, instead of producing correct latex commands. Cannot distinguish
-+file, instead of producing correct LaTeX commands. Cannot distinguish
- between empty table cell and end of table row.
- 
- 
diff --git a/textproc/catdoc/patches/patch-ac b/textproc/catdoc/patches/patch-ac
index 5e2b1674198..2c0466e36db 100644
--- a/textproc/catdoc/patches/patch-ac
+++ b/textproc/catdoc/patches/patch-ac
@@ -1,30 +1,9 @@
-$NetBSD: patch-ac,v 1.5 2006/10/01 08:58:24 schwarz Exp $
+$NetBSD: patch-ac,v 1.6 2007/01/24 17:07:00 reed Exp $
 
---- src/Makefile.in.orig	1999-12-30 15:24:10.000000000 +0100
-+++ src/Makefile.in	2006-09-21 00:20:08.000000000 +0200
-@@ -18,7 +18,7 @@
- install_targets = @installtargets@
- # Flags to pass to your C compilier
- # remove -O2 on HP/UX 9. It is known to cause problems
--FLAGS=-Wall -O2 -g 
-+#FLAGS=-Wall -O2 -g 
- 
- #Compile-time configuration of catdoc itself. Edit according to taste
- 
-@@ -61,19 +61,19 @@
-  -DREPL_EXT=\"$(REPL_EXT)\" -DUNKNOWN_CHAR=\'$(UNKNOWN_CHAR)\'\
-  -DSOURCE_CHARSET=\"$(SOURCE_CHARSET)\" -DTARGET_CHARSET=\"$(TARGET_CHARSET)\"
- 
--CFLAGS=$(FLAGS) $(DEFINES) @DEFS@
-+FLAGS=$(CFLAGS) $(DEFINES) @DEFS@ $(CPPFLAGS)
- OBJ=catdoc.o charsets.o substmap.o reader.o writer.o fileutil.o\
- 	confutil.o analyze.o rtfreader.o
- 
- OBJXLS=xls2csv.o charsets.o substmap.o fileutil.o confutil.o
- 
- #.c.o:
--#	$(CC) -c $(CFLAGS) $*
-+#	$(CC) -c $(FLAGS) $*
+--- src/Makefile.in.orig	2007-01-24 10:47:01.000000000 -0600
++++ src/Makefile.in	2007-01-24 10:47:39.000000000 -0600
+@@ -74,12 +74,12 @@
+ #	$(CC) -c $(CFLAGS) $*
  all: @buildtargets@
  catdoc: $(OBJ)
 -	$(CC)  -o catdoc  $(OBJ)
@@ -32,6 +11,10 @@ $NetBSD: patch-ac,v 1.5 2006/10/01 08:58:24 schwarz Exp $
  xls2csv: $(OBJXLS)
 -	$(CC) -o xls2csv $(OBJXLS) -lm
 +	$(CC) -o xls2csv $(OBJXLS) -lm @LIBS@
+ 
+ catppt: $(OBJPPT)
+-	$(CC) -o catppt $(OBJPPT) -lm
++	$(CC) -o catppt $(OBJPPT) -lm @LIBS@
+ 
  install: @installtargets@
- install-catdoc:catdoc xls2csv
- 	../mkinstalldirs $(installroot)$(bindir)
+ install-catdoc:catdoc xls2csv catppt 
diff --git a/textproc/catdoc/patches/patch-ad b/textproc/catdoc/patches/patch-ad
deleted file mode 100644
index 578ac98a496..00000000000
--- a/textproc/catdoc/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2003/09/17 14:57:30 jmmv Exp $
-
---- configure.orig	1999-12-14 11:45:12.000000000 +0100
-+++ configure
-@@ -983,7 +983,6 @@ test -z "$manext" && manext=.1
- test -z "$man1dir" && man1dir=\${prefix}/man/man1
- installtargets="install-catdoc install-wordview"
- buildtargets="catdoc xls2csv wordview"
--if test -n "$WISH"; then
- # Check whether --enable-wordview or --disable-wordview was given.
- if test "${enable_wordview+set}" = set; then
-   enableval="$enable_wordview"
-@@ -995,8 +994,6 @@ fi
- 
- fi
- 
--fi
--
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:1002: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
diff --git a/textproc/catdoc/patches/patch-ae b/textproc/catdoc/patches/patch-ae
deleted file mode 100644
index 03916f47d45..00000000000
--- a/textproc/catdoc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/06/22 21:11:35 is Exp $
-
---- src/xls2csv.c.orig	1999-12-30 15:22:19.000000000 +0100
-+++ src/xls2csv.c
-@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
-     char *filename;
-     short int *tmp_charset;
-     char *dest_csname; 
--    char c;
-+    int c;
-     int i;
-     check_charset(&dest_csname,TARGET_CHARSET); 
-     while ((c=getopt(argc,argv,"ls:d:xq:c:"))!=-1) {
diff --git a/textproc/catdoc/patches/patch-af b/textproc/catdoc/patches/patch-af
index eb0bfad5307..d2d86a2d19b 100644
--- a/textproc/catdoc/patches/patch-af
+++ b/textproc/catdoc/patches/patch-af
@@ -1,10 +1,12 @@
-$NetBSD: patch-af,v 1.1 2005/06/22 21:11:36 is Exp $
+$NetBSD: patch-af,v 1.2 2007/01/24 17:07:00 reed Exp $
 
---- src/analyze.c.orig	2005-06-22 22:50:38.000000000 +0200
-+++ src/analyze.c
-@@ -1,4 +1,5 @@
+--- src/analyze.c.orig	2007-01-24 10:50:15.000000000 -0600
++++ src/analyze.c	2007-01-24 10:50:32.000000000 -0600
+@@ -8,6 +8,7 @@
+ #include <config.h>
+ #endif
  #include <stdio.h>
 +#include <stdlib.h>
  #include <limits.h>
+ #include <stdlib.h>
  #include <string.h>
- #include "catdoc.h"