Thu Apr 17 21:07:18 2008 UTC ()
Fix hunspell backend. Idea from Matthias Drochner, patch from Adam Hoka.
Fix path to hunspell directories. Make hunspell the default backend.

Bump PKGREVISION.


(wiz)
diff -r1.24 -r1.25 pkgsrc/textproc/enchant/Makefile
diff -r1.10 -r1.11 pkgsrc/textproc/enchant/distinfo
diff -r1.2 -r1.3 pkgsrc/textproc/enchant/options.mk
diff -r0 -r1.3 pkgsrc/textproc/enchant/patches/patch-ab
cvs diff -r1.24 -r1.25 pkgsrc/textproc/enchant/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/enchant/Makefile 2008/04/17 14:29:58 1.24
+++ pkgsrc/textproc/enchant/Makefile 2008/04/17 21:07:18 1.25
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.24 2008/04/17 14:29:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2008/04/17 21:07:18 wiz Exp $
2# 2#
3 3
4DISTNAME= enchant-1.4.0 4DISTNAME= enchant-1.4.0
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://www.abisource.com/downloads/enchant/1.4.0/ 7MASTER_SITES= http://www.abisource.com/downloads/enchant/1.4.0/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.abisource.com/projects/enchant/ 10HOMEPAGE= http://www.abisource.com/projects/enchant/
11COMMENT= Generic spell checking library 11COMMENT= Generic spell checking library
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_TOOLS+= pkg-config autoconf 15USE_TOOLS+= pkg-config autoconf
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19PKGCONFIG_OVERRIDE+= enchant.pc.in 19PKGCONFIG_OVERRIDE+= enchant.pc.in
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CFLAGS.SunOS+= -D__EXTENSIONS__ 21CFLAGS.SunOS+= -D__EXTENSIONS__
22 22
 23CONFIGURE_ARGS+= --with-myspell-dir=${BUILDLINK_PREFIX.hunspell}/share/hunspell
 24
23pre-configure: 25pre-configure:
24 cd ${WRKSRC} && autoconf 26 cd ${WRKSRC} && autoconf
25 27
26.include "options.mk" 28.include "options.mk"
27 29
28.include "../../devel/glib2/buildlink3.mk" 30.include "../../devel/glib2/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/textproc/enchant/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/enchant/distinfo 2008/04/17 14:29:58 1.10
+++ pkgsrc/textproc/enchant/distinfo 2008/04/17 21:07:18 1.11
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.10 2008/04/17 14:29:58 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2008/04/17 21:07:18 wiz Exp $
2 2
3SHA1 (enchant-1.4.0.tar.gz) = 1a3c140c96769d3268a7f1faf7d9400016985537 3SHA1 (enchant-1.4.0.tar.gz) = 1a3c140c96769d3268a7f1faf7d9400016985537
4RMD160 (enchant-1.4.0.tar.gz) = 84a253e665f71ba5b3277ad95a403ea386d42ba4 4RMD160 (enchant-1.4.0.tar.gz) = 84a253e665f71ba5b3277ad95a403ea386d42ba4
5Size (enchant-1.4.0.tar.gz) = 601930 bytes 5Size (enchant-1.4.0.tar.gz) = 601930 bytes
6SHA1 (patch-aa) = 56ca983fdd6de171aba956b46c673299dcb7549e 6SHA1 (patch-aa) = 56ca983fdd6de171aba956b46c673299dcb7549e
 7SHA1 (patch-ab) = fd2319dd225493d643facb8fbe7f88dee810b1db
cvs diff -r1.2 -r1.3 pkgsrc/textproc/enchant/options.mk (expand / switch to unified diff)

--- pkgsrc/textproc/enchant/options.mk 2008/04/17 14:29:58 1.2
+++ pkgsrc/textproc/enchant/options.mk 2008/04/17 21:07:18 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.2 2008/04/17 14:29:58 wiz Exp $ 1# $NetBSD: options.mk,v 1.3 2008/04/17 21:07:18 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.enchant 3PKG_OPTIONS_VAR= PKG_OPTIONS.enchant
4PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell ispell 4PKG_SUPPORTED_OPTIONS= aspell enchant-zemberek hunspell ispell
5# Package also supports the following: 5# Package also supports the following:
6# hspell - Hebrew spelling 6# hspell - Hebrew spelling
7# uspell - Yiddish spelling 7# uspell - Yiddish spelling
8# voikko - Finnish spelling 8# voikko - Finnish spelling
9PKG_SUGGESTED_OPTIONS= aspell ispell 9PKG_SUGGESTED_OPTIONS= hunspell ispell
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= aspell 13PLIST_VARS+= aspell
14.if !empty(PKG_OPTIONS:Maspell) 14.if !empty(PKG_OPTIONS:Maspell)
15CONFIGURE_ARGS+= --enable-aspell 15CONFIGURE_ARGS+= --enable-aspell
16.include "../../textproc/aspell/buildlink3.mk" 16.include "../../textproc/aspell/buildlink3.mk"
17PLIST.aspell= yes 17PLIST.aspell= yes
18.else 18.else
19CONFIGURE_ARGS+= --disable-aspell 19CONFIGURE_ARGS+= --disable-aspell
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Menchant-zemberek) 22.if !empty(PKG_OPTIONS:Menchant-zemberek)
File Added: pkgsrc/textproc/enchant/patches/Attic/patch-ab
$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);