[pkgsrc/trunk]: pkgsrc/textproc/sablotron Fix building this with sun studio c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80323b7030ce
branches:  trunk
changeset: 523289:80323b7030ce
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Fri Jan 05 13:48:14 2007 +0000

description:
Fix building this with sun studio compilers.  Patch submitted upstream.

diffstat:

 textproc/sablotron/Makefile         |   4 ++--
 textproc/sablotron/distinfo         |   3 ++-
 textproc/sablotron/patches/patch-aa |  21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r a86bdea385b1 -r 80323b7030ce textproc/sablotron/Makefile
--- a/textproc/sablotron/Makefile       Fri Jan 05 13:41:21 2007 +0000
+++ b/textproc/sablotron/Makefile       Fri Jan 05 13:48:14 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/07/10 07:59:02 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2007/01/05 13:48:14 dmcmahill Exp $
 
 DISTNAME=              Sablot-1.0.2
 PKGNAME=               ${DISTNAME:S/Sablot/sablotron/}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            textproc
 MASTER_SITES=          http://download-1.gingerall.cz/download/sablot/
 
diff -r a86bdea385b1 -r 80323b7030ce textproc/sablotron/distinfo
--- a/textproc/sablotron/distinfo       Fri Jan 05 13:41:21 2007 +0000
+++ b/textproc/sablotron/distinfo       Fri Jan 05 13:48:14 2007 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/06/06 20:14:43 jwise Exp $
+$NetBSD: distinfo,v 1.12 2007/01/05 13:48:14 dmcmahill Exp $
 
 SHA1 (Sablot-1.0.2.tar.gz) = ac17c9c12077d429c6051df2de09a4ab974d3c58
 RMD160 (Sablot-1.0.2.tar.gz) = 314b925c46c17d23ba21507ea56c414264f3581f
 Size (Sablot-1.0.2.tar.gz) = 606814 bytes
+SHA1 (patch-aa) = 29f5a97eda642b925c8c5390c3b60706825ac30f
diff -r a86bdea385b1 -r 80323b7030ce textproc/sablotron/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/sablotron/patches/patch-aa       Fri Jan 05 13:48:14 2007 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.4 2007/01/05 13:48:14 dmcmahill Exp $
+
+needed to build with sun studio compilers.
+Patch submitted to sab-bugs at gingerall dot com
+on 2007-01-05
+
+--- src/command/sabcmd.cpp.orig        2004-12-30 04:30:44.000000000 -0500
++++ src/command/sabcmd.cpp
+@@ -211,8 +211,10 @@ void saberrn(const char *msg, int num)
+ 
+ int chrpos(const char *text, char c)
+ {
+-    char *p = strchr(text, c);
+-    return p ? (int)(p - text) : -1;
++    const char *p;
++
++    p = strchr(text, (int) c);
++    return (p != NULL) ? (int)(p - text) : -1;
+ }
+ 
+ void freefirst(char **array)