[pkgsrc/trunk]: pkgsrc/textproc/aspell Made the package work on Solaris. It n...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aaa26f15053d
branches:  trunk
changeset: 521844:aaa26f15053d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 24 16:31:48 2006 +0000

description:
Made the package work on Solaris. It needed an obscure patch and
USE_PKGLOCALEDIR.

diffstat:

 textproc/aspell/Makefile         |   3 ++-
 textproc/aspell/distinfo         |   4 ++--
 textproc/aspell/patches/patch-ad |  17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diffs (63 lines):

diff -r b419db2b893b -r aaa26f15053d textproc/aspell/Makefile
--- a/textproc/aspell/Makefile  Fri Nov 24 15:44:25 2006 +0000
+++ b/textproc/aspell/Makefile  Fri Nov 24 16:31:48 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/11/05 17:02:18 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2006/11/24 16:31:48 rillig Exp $
 #
 
 DISTNAME=              aspell-0.60.4
@@ -20,6 +20,7 @@
 USE_TOOLS+=            perl:run
 USE_LIBTOOL=           yes
 USE_LANGUAGES=         c c++
+USE_PKGLOCALEDIR=      yes
 INFO_FILES=            # PLIST
 
 CONFIGURE_ARGS+=       --enable-doc-dir=${PREFIX}/share/doc/aspell
diff -r b419db2b893b -r aaa26f15053d textproc/aspell/distinfo
--- a/textproc/aspell/distinfo  Fri Nov 24 15:44:25 2006 +0000
+++ b/textproc/aspell/distinfo  Fri Nov 24 16:31:48 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2006/10/01 08:52:01 schwarz Exp $
+$NetBSD: distinfo,v 1.22 2006/11/24 16:31:48 rillig Exp $
 
 SHA1 (aspell-0.60.4.tar.gz) = 07353593eb89e64c49b1fd8dd405e3ee0ed86291
 RMD160 (aspell-0.60.4.tar.gz) = e0408acd4f3304c957aeea0b17a28d0c44e11064
@@ -6,7 +6,7 @@
 SHA1 (patch-aa) = f68dd79ef2d3290b019d7588cadb4fdf53b3b988
 SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f
 SHA1 (patch-ac) = 8adbd2b330830ba0fb3fc063bee0fac69b0a1f64
-SHA1 (patch-ad) = ac4dd7b4df79b7755be1184f625460b64762a89c
+SHA1 (patch-ad) = 0af066d4da0e4f6e69135a2d3bc58858b71cac8a
 SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836
 SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138
 SHA1 (patch-ag) = 04b34f2b780a632a5045120ae408ceea591a66de
diff -r b419db2b893b -r aaa26f15053d textproc/aspell/patches/patch-ad
--- a/textproc/aspell/patches/patch-ad  Fri Nov 24 15:44:25 2006 +0000
+++ b/textproc/aspell/patches/patch-ad  Fri Nov 24 16:31:48 2006 +0000
@@ -1,4 +1,10 @@
-$NetBSD: patch-ad,v 1.5 2006/10/01 08:52:01 schwarz Exp $
+$NetBSD: patch-ad,v 1.6 2006/11/24 16:31:48 rillig Exp $
+
+The second hunk is needed for Solaris with SunPro, but I don't have a
+clue why.
+
+See also:
+* http://src.opensolaris.org/source/xref/jds/spec-files/trunk/patches/aspell-01-forte.diff
 
 --- common/convert.cpp.orig    2006-09-17 19:24:05.000000000 +0200
 +++ common/convert.cpp 2006-09-17 19:24:46.000000000 +0200
@@ -13,3 +19,12 @@
  namespace acommon {
  
    typedef unsigned char  byte;
+@@ -238,7 +242,7 @@ namespace acommon {
+   }
+ 
+   template <class T>
+-  static void free_norm_table(NormTable<T> * d)
++  void free_norm_table(NormTable<T> * d)
+   {
+     for (T * cur = d->data; cur != d->end; ++cur) {
+       if (cur->sub_table)