[pkgsrc/pkgsrc-2005Q2]: pkgsrc/textproc/catdoc Pullup ticket 557 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46b786ad8139
branches:  pkgsrc-2005Q2
changeset: 495815:46b786ad8139
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Jun 22 23:20:06 2005 +0000

description:
Pullup ticket 557 - requested by Ignatios Souvatzis
portability fixes for catdoc

Revisions pulled up:
- pkgsrc/textproc/catdoc/Makefile               1.26
- pkgsrc/textproc/catdoc/distinfo               1.5
- pkgsrc/textproc/catdoc/patches/patch-ae       1.1
- pkgsrc/textproc/catdoc/patches/patch-af       1.1

   Module Name:         pkgsrc
   Committed By:        is
   Date:                Wed Jun 22 21:11:36 UTC 2005

   Modified Files:
        pkgsrc/textproc/catdoc: Makefile distinfo
   Added Files:
        pkgsrc/textproc/catdoc/patches: patch-ae patch-af

   Log Message:
   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:

 textproc/catdoc/Makefile         |   4 ++--
 textproc/catdoc/distinfo         |   4 +++-
 textproc/catdoc/patches/patch-ae |  13 +++++++++++++
 textproc/catdoc/patches/patch-af |  10 ++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diffs (61 lines):

diff -r 76701f734c19 -r 46b786ad8139 textproc/catdoc/Makefile
--- a/textproc/catdoc/Makefile  Wed Jun 22 15:56:55 2005 +0000
+++ b/textproc/catdoc/Makefile  Wed Jun 22 23:20:06 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2003/09/17 14:57:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.25.14.1 2005/06/22 23:20:06 salo Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 CONFIGURE_ARGS+=       --disable-wordview
 CONFIGURE_ENV+=                enable_wordview=no
diff -r 76701f734c19 -r 46b786ad8139 textproc/catdoc/distinfo
--- a/textproc/catdoc/distinfo  Wed Jun 22 15:56:55 2005 +0000
+++ b/textproc/catdoc/distinfo  Wed Jun 22 23:20:06 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:40 agc Exp $
+$NetBSD: distinfo,v 1.4.4.1 2005/06/22 23:20:06 salo Exp $
 
 SHA1 (catdoc-0.91.4.tar.gz) = f486345447993bc818093f84b505c2ebbb046954
 RMD160 (catdoc-0.91.4.tar.gz) = 6519112a49c495c2b2fcee442c841d1ee23e9970
@@ -7,3 +7,5 @@
 SHA1 (patch-ab) = 328c6d3f1613dff35760836bf051c48fba343576
 SHA1 (patch-ac) = 4b008af59792a155421bc99d6daf31db0da50c63
 SHA1 (patch-ad) = 8c31913ccee50b7f1b26b7a2f0ab48ae9368cadd
+SHA1 (patch-ae) = e088cd6ca202a6d201ff6f7d93a98dc1c712f3c0
+SHA1 (patch-af) = d813dbbadd7749b80aa7bab47d8b963ad41cc1fc
diff -r 76701f734c19 -r 46b786ad8139 textproc/catdoc/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/catdoc/patches/patch-ae  Wed Jun 22 23:20:06 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.2.2 2005/06/22 23:20:06 salo 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 -r 76701f734c19 -r 46b786ad8139 textproc/catdoc/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/catdoc/patches/patch-af  Wed Jun 22 23:20:06 2005 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.1.2.2 2005/06/22 23:20:06 salo 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"