[pkgsrc/trunk]: pkgsrc/textproc/enchant Fix hunspell backend. Idea from Matth...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/661ae2a33d11
branches:  trunk
changeset: 541258:661ae2a33d11
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Apr 17 21:07:18 2008 +0000

description:
Fix hunspell backend. Idea from Matthias Drochner, patch from Adam Hoka.
Fix path to hunspell directories. Make hunspell the default backend.

Bump PKGREVISION.

diffstat:

 textproc/enchant/Makefile         |   6 ++++--
 textproc/enchant/distinfo         |   3 ++-
 textproc/enchant/options.mk       |   4 ++--
 textproc/enchant/patches/patch-ab |  22 ++++++++++++++++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r bff0d5055295 -r 661ae2a33d11 textproc/enchant/Makefile
--- a/textproc/enchant/Makefile Thu Apr 17 20:41:15 2008 +0000
+++ b/textproc/enchant/Makefile Thu Apr 17 21:07:18 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2008/04/17 14:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/04/17 21:07:18 wiz Exp $
 #
 
 DISTNAME=              enchant-1.4.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            textproc
 MASTER_SITES=          http://www.abisource.com/downloads/enchant/1.4.0/
 
@@ -20,6 +20,8 @@
 GNU_CONFIGURE=         yes
 CFLAGS.SunOS+=         -D__EXTENSIONS__
 
+CONFIGURE_ARGS+=       --with-myspell-dir=${BUILDLINK_PREFIX.hunspell}/share/hunspell
+
 pre-configure:
        cd ${WRKSRC} && autoconf
 
diff -r bff0d5055295 -r 661ae2a33d11 textproc/enchant/distinfo
--- a/textproc/enchant/distinfo Thu Apr 17 20:41:15 2008 +0000
+++ b/textproc/enchant/distinfo Thu Apr 17 21:07:18 2008 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2008/04/17 14:29:58 wiz Exp $
+$NetBSD: distinfo,v 1.11 2008/04/17 21:07:18 wiz Exp $
 
 SHA1 (enchant-1.4.0.tar.gz) = 1a3c140c96769d3268a7f1faf7d9400016985537
 RMD160 (enchant-1.4.0.tar.gz) = 84a253e665f71ba5b3277ad95a403ea386d42ba4
 Size (enchant-1.4.0.tar.gz) = 601930 bytes
 SHA1 (patch-aa) = 56ca983fdd6de171aba956b46c673299dcb7549e
+SHA1 (patch-ab) = fd2319dd225493d643facb8fbe7f88dee810b1db
diff -r bff0d5055295 -r 661ae2a33d11 textproc/enchant/options.mk
--- a/textproc/enchant/options.mk       Thu Apr 17 20:41:15 2008 +0000
+++ b/textproc/enchant/options.mk       Thu Apr 17 21:07:18 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/04/17 14:29:58 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/17 21:07:18 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.enchant
 PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell ispell
@@ -6,7 +6,7 @@
 # hspell - Hebrew spelling
 # uspell - Yiddish spelling
 # voikko - Finnish spelling
-PKG_SUGGESTED_OPTIONS= aspell ispell
+PKG_SUGGESTED_OPTIONS= hunspell ispell
 
 .include "../../mk/bsd.options.mk"
 
diff -r bff0d5055295 -r 661ae2a33d11 textproc/enchant/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/enchant/patches/patch-ab Thu Apr 17 21:07:18 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2008/04/17 21:07:18 wiz Exp $
+
+--- src/myspell/myspell_checker.cpp.orig       2008-03-21 02:45:24.000000000 +0100
++++ src/myspell/myspell_checker.cpp
+@@ -39,7 +39,7 @@
+ #include "enchant-provider.h"
+ 
+ /* built against hunspell 1.1.5 on 2007-03-19 */
+-#include "hunspell.hxx"
++#include <hunspell/hunspell.hxx>
+ 
+ ENCHANT_PLUGIN_DECLARE("Myspell")
+ 
+@@ -353,7 +353,7 @@ MySpellChecker::requestDictionary(const 
+       strcpy(aff+len_dic-3, "aff");
+       if (g_file_test(aff, G_FILE_TEST_EXISTS))
+       {
+-              myspell = new Hunspell(aff, dic);
++              myspell = new Hunspell(aff, dic, NULL);
+       }
+       g_free(dic);
+       g_free(aff);