diff options
| author | is <is> | 2005-06-22 21:11:35 +0000 |
|---|---|---|
| committer | is <is> | 2005-06-22 21:11:35 +0000 |
| commit | c1bf3b6d0434c0d315cbaba5aca1e7a3463fc120 (patch) | |
| tree | a02b2b86228461174e63768ae7b06f64905b8487 /textproc/catdoc | |
| parent | 8ebc54ef6c22cb1b0a4a208026fec202fb7208b0 (diff) | |
| download | pkgsrc-c1bf3b6d0434c0d315cbaba5aca1e7a3463fc120.tar.gz | |
getopt() returns an int so that -1 can be distinguished from any character
value (xls2csv wouldn't accept any command line without this fix).
While we're here, add <stdlib.h> to analyze.c so that exit() is
declared.
Diffstat (limited to 'textproc/catdoc')
| -rw-r--r-- | textproc/catdoc/Makefile | 4 | ||||
| -rw-r--r-- | textproc/catdoc/distinfo | 4 | ||||
| -rw-r--r-- | textproc/catdoc/patches/patch-ae | 13 | ||||
| -rw-r--r-- | textproc/catdoc/patches/patch-af | 10 |
4 files changed, 28 insertions, 3 deletions
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile index c729df050bb..5347684d231 100644 --- a/textproc/catdoc/Makefile +++ b/textproc/catdoc/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2003/09/17 14:57:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2005/06/22 21:11:35 is Exp $ # .include "Makefile.common" -PKGREVISION= 1 +PKGREVISION= 2 CONFIGURE_ARGS+= --disable-wordview CONFIGURE_ENV+= enable_wordview=no diff --git a/textproc/catdoc/distinfo b/textproc/catdoc/distinfo index 48644744986..3990b5764e5 100644 --- a/textproc/catdoc/distinfo +++ b/textproc/catdoc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 14:48:40 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/06/22 21:11:35 is Exp $ SHA1 (catdoc-0.91.4.tar.gz) = f486345447993bc818093f84b505c2ebbb046954 RMD160 (catdoc-0.91.4.tar.gz) = 6519112a49c495c2b2fcee442c841d1ee23e9970 @@ -7,3 +7,5 @@ SHA1 (patch-aa) = 3f232d00d2bc0f55397b76674d6136da81bc887e SHA1 (patch-ab) = 328c6d3f1613dff35760836bf051c48fba343576 SHA1 (patch-ac) = 4b008af59792a155421bc99d6daf31db0da50c63 SHA1 (patch-ad) = 8c31913ccee50b7f1b26b7a2f0ab48ae9368cadd +SHA1 (patch-ae) = e088cd6ca202a6d201ff6f7d93a98dc1c712f3c0 +SHA1 (patch-af) = d813dbbadd7749b80aa7bab47d8b963ad41cc1fc diff --git a/textproc/catdoc/patches/patch-ae b/textproc/catdoc/patches/patch-ae new file mode 100644 index 00000000000..03916f47d45 --- /dev/null +++ b/textproc/catdoc/patches/patch-ae @@ -0,0 +1,13 @@ +$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 new file mode 100644 index 00000000000..eb0bfad5307 --- /dev/null +++ b/textproc/catdoc/patches/patch-af @@ -0,0 +1,10 @@ +$NetBSD: patch-af,v 1.1 2005/06/22 21:11:36 is Exp $ + +--- src/analyze.c.orig 2005-06-22 22:50:38.000000000 +0200 ++++ src/analyze.c +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <stdlib.h> + #include <limits.h> + #include <string.h> + #include "catdoc.h" |