pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc Update to version 0.94.2.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/672ad9117ebe
branches:  trunk
changeset: 524373:672ad9117ebe
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed Jan 24 17:07:00 2007 +0000

description:
Update to version 0.94.2.

Removed four patches.

Improved DESCRiptions.

Improved COMMENT. catdoc is now:
COMMENT=Converts MS Word, Excel and Powerpoint files to plain text
catdoc-tk's COMMENT is made to stay the same.

The catdoc-tk package now installs manpage also.
And don't waste time building catdoc and binaries in catdoc-tk.
(Should catdoc-tk package be renamed to "wordview?")

The changelog is at
http://www.45.free.net/~vitus/software/catdoc/changelog.html

A lot of fixes plus now adds catppt utility to process powerpoint files.

Also has many new character encodings and doesn't install xlsview.

diffstat:

 textproc/catdoc-tk/DESCR         |  13 ++++---------
 textproc/catdoc-tk/Makefile      |  12 +++++++-----
 textproc/catdoc-tk/PLIST         |   3 ++-
 textproc/catdoc/DESCR            |  22 +++++++++++++++-------
 textproc/catdoc/Makefile         |   4 +---
 textproc/catdoc/Makefile.common  |   7 +++----
 textproc/catdoc/PLIST            |  18 +++++++++++++++---
 textproc/catdoc/distinfo         |  16 ++++++----------
 textproc/catdoc/patches/patch-aa |  11 -----------
 textproc/catdoc/patches/patch-ab |  25 -------------------------
 textproc/catdoc/patches/patch-ac |  39 +++++++++++----------------------------
 textproc/catdoc/patches/patch-ad |  21 ---------------------
 textproc/catdoc/patches/patch-ae |  13 -------------
 textproc/catdoc/patches/patch-af |  12 +++++++-----
 14 files changed, 71 insertions(+), 145 deletions(-)

diffs (truncated from 343 to 300 lines):

diff -r dc81a3139dca -r 672ad9117ebe textproc/catdoc-tk/DESCR
--- a/textproc/catdoc-tk/DESCR  Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc-tk/DESCR  Wed Jan 24 17:07:00 2007 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc-tk/Makefile
--- a/textproc/catdoc-tk/Makefile       Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc-tk/Makefile       Wed Jan 24 17:07:00 2007 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc-tk/PLIST
--- a/textproc/catdoc-tk/PLIST  Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc-tk/PLIST  Wed Jan 24 17:07:00 2007 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/DESCR
--- a/textproc/catdoc/DESCR     Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc/DESCR     Wed Jan 24 17:07:00 2007 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/Makefile
--- a/textproc/catdoc/Makefile  Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc/Makefile  Wed Jan 24 17:07:00 2007 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/Makefile.common
--- a/textproc/catdoc/Makefile.common   Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc/Makefile.common   Wed Jan 24 17:07:00 2007 +0000
@@ -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@localhost
 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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/PLIST
--- a/textproc/catdoc/PLIST     Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc/PLIST     Wed Jan 24 17:07:00 2007 +0000
@@ -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/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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/distinfo
--- a/textproc/catdoc/distinfo  Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc/distinfo  Wed Jan 24 17:07:00 2007 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/patches/patch-aa
--- a/textproc/catdoc/patches/patch-aa  Wed Jan 24 16:30:39 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/patches/patch-ab
--- a/textproc/catdoc/patches/patch-ab  Wed Jan 24 16:30:39 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/patches/patch-ac
--- a/textproc/catdoc/patches/patch-ac  Wed Jan 24 16:30:39 2007 +0000
+++ b/textproc/catdoc/patches/patch-ac  Wed Jan 24 17:07:00 2007 +0000
@@ -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 @@
  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 -r dc81a3139dca -r 672ad9117ebe textproc/catdoc/patches/patch-ad
--- a/textproc/catdoc/patches/patch-ad  Wed Jan 24 16:30:39 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
- 



Home | Main Index | Thread Index | Old Index