Attachment #177703 for bug #215083

View | Details | Raw Unified | Return to bug 215083
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	enchant
PORTVERSION=	2.2.2
PORTREVISION=	6
CATEGORIES=	textproc gnome
DIST_SUBDIR=	${PORTNAME}
DIST_SUBDIR=	gnome2

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Dictionary/spellchecking framework

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING.LIB

USE_GITHUB=	yes
GH_ACCOUNT=	AbiWord
GH_TAGNAME=	release-${PORTVERSION:C/\./-/g}

GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
USES=		autoreconf gettext gmake libtool pathfix pkgconfig
USE_GNOME=	glib20
CONFIGURE_ARGS=	--disable-uspell
		--disable-voikko

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

OPTIONS_MULTI=	SPELL
OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ISPELL
OPTIONS_DEFAULT=HUNSPELL
OPTIONS_SUB=	yes
HSPELL_DESC=	Spell checking via Hspell
HUNSPELL_DESC=	Spell checking via Hunspell
ZEMBEREK_DESC=	Spell checking via Zemberek

ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
ASPELL_CONFIGURE_ENABLE=	aspell


HSPELL_BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:hebrew/hspell
HSPELL_CONFIGURE_ENABLE=	hspell
HSPELL_CONFIGURE_ON=	--with-hspell-prefix=${LOCALBASE}	\
			--with-hspell-dir=${LOCALBASE}/share/hspell

HUNSPELL_LIB_DEPENDS=	libhunspell-1.5.so:textproc/hunspell
HUNSPELL_CONFIGURE_ENABLE=	myspell
HUNSPELL_CONFIGURE_ON=	--with-myspell-dir=${LOCALBASE}/share/hunspell
			--with-myspell-dir=${LOCALBASE}/share/hunspell

ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
ISPELL_CONFIGURE_ENABLE=	ispell

ZEMBEREK_LIb_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
ZEMBEREK_CONFIGURE_ENABLE=	zemberek

post-patch:
	@${REINPLACE_CMD} -e 's|MKDIRPROG-mkdir|MKDIRPROG-mkdir -p|g' \
		${WRKSRC}/install-sh

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)textproc/enchant/distinfo (-2 / +3 lines)
1	SHA256 (gnome2/enchant-1.6.0.tar.gz) = 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f	1	TIMESTAMP = 1480870868
2	SIZE (gnome2/enchant-1.6.0.tar.gz) = 607018	2	SHA256 (enchant/AbiWord-enchant-2.2.2-release-2-2-2_GH0.tar.gz) = 17d8c11c3f9628c14c50636480b91bf231ef02e2dc4ad7f1950f866000289fed
		3	SIZE (enchant/AbiWord-enchant-2.2.2-release-2-2-2_GH0.tar.gz) = 119932

Lines 1-11 Link Here

(-)textproc/enchant/files/patch-configure (-11 lines)
1	--- configure.orig 2013-08-16 18:30:56.000000000 +0200
2	+++ configure 2013-08-16 18:31:33.000000000 +0200
3	@@ -18213,7 +18213,7 @@
4	fi
5
6
7	- ASPELL_CFLAGS+=" -DHAVE_PSPELL_H"
8	+ ASPELL_CFLAGS="${ASPELL_CFLAGS} -DHAVE_PSPELL_H"
9	elif test -f "$aspell_prefix/include/aspell.h"; then
10	{ $as_echo "$as_me:$LINENO: result: yes (aspell)" >&5
11	$as_echo "yes (aspell)" >&6; }

Line 0 Link Here

(-)textproc/enchant/files/patch-configure.in (+11 lines)
	1	--- configure.in.orig 2011-06-11 15:05:29 UTC
	2	+++ configure.in
	3	@@ -102,7 +102,7 @@ fi
	4
	5	with_system_myspell=no
	6	if test "x$build_myspell" != "xno"; then
	7	- PKG_CHECK_MODULES(MYSPELL, myspell, with_system_myspell=yes, with_system_myspell=no)
	8	+ PKG_CHECK_MODULES(MYSPELL, hunspell, with_system_myspell=yes, with_system_myspell=no)
	9	fi
	10	AM_CONDITIONAL(WITH_SYSTEM_MYSPELL, test "x$with_system_myspell" = "xyes")
	11




--- src/myspell/myspell_checker.cpp.orig	2011-06-11 15:05:29 UTC
+++ src/myspell/myspell_checker.cpp
@@ -39,7 +39,7 @@
 #include "enchant-provider.h"
 
 #ifdef WITH_SYSTEM_MYSPELL
-#include <myspell.hxx>
+#include <hunspell/hunspell.hxx>
 #else
 #include "enchant_myspell.hxx"
 #endif
@@ -66,7 +66,7 @@ public:
 private:
 	GIConv  m_translate_in; /* Selected translation from/to Unicode */
 	GIConv  m_translate_out;
-	MySpell *myspell;
+	Hunspell *myspell;
 };
 
 /***************************************************************************/
@@ -247,10 +247,10 @@ MySpellChecker::requestDictionary(const 
 	aff = g_strdup(dic);
 	int len_dic = strlen(dic);
 	strcpy(aff+len_dic-3, "aff");
-	myspell = new MySpell(aff, dic);
+	myspell = new Hunspell(aff, dic);
 	g_free(dic);
 	g_free(aff);
-	char *enc = myspell->get_dic_encoding();
+	const char *enc = myspell->get_dic_encoding();
 

Lines 1-22 Link Here

(-)textproc/enchant/pkg-plist (-8 / +13 lines)
1	bin/enchant	1	bin/enchant
2	bin/enchant-lsmod	2	bin/enchant-lsmod
3	include/enchant/enchant++.h
4	include/enchant/enchant-provider.h	3	include/enchant/enchant-provider.h
5	include/enchant/enchant.h	4	include/enchant/enchant.h
		5	include/enchant/enchant++.h
		6	lib/libenchant.a
		7	lib/libenchant.so
		8	lib/libenchant.so.1
		9	lib/libenchant.so.1.1.4
6	%%ASPELL%%lib/enchant/libenchant_aspell.a	10	%%ASPELL%%lib/enchant/libenchant_aspell.a
7	%%ASPELL%%lib/enchant/libenchant_aspell.so	11	%%ASPELL%%lib/enchant/libenchant_aspell.so
		12	%%ASPELL%%lib/enchant/libenchant_aspell.so.1
		13	%%ASPELL%%lib/enchant/libenchant_aspell.so.1.1.4
8	%%HSPELL%%lib/enchant/libenchant_hspell.a	14	%%HSPELL%%lib/enchant/libenchant_hspell.a
9	%%HSPELL%%lib/enchant/libenchant_hspell.so	15	%%HSPELL%%lib/enchant/libenchant_hspell.so
		16	%%HSPELL%%lib/enchant/libenchant_hspell.so.1
		17	%%HSPELL%%lib/enchant/libenchant_hspell.so.1.1.4
10	%%ISPELL%%lib/enchant/libenchant_ispell.a	18	%%ISPELL%%lib/enchant/libenchant_ispell.a
11	%%ISPELL%%lib/enchant/libenchant_ispell.so	19	%%ISPELL%%lib/enchant/libenchant_ispell.so
		20	%%ISPELL%%lib/enchant/libenchant_ispell.so.1
		21	%%ISPELL%%lib/enchant/libenchant_ispell.so.1.1.4
12	%%HUNSPELL%%lib/enchant/libenchant_myspell.a	22	%%HUNSPELL%%lib/enchant/libenchant_myspell.a
13	%%HUNSPELL%%lib/enchant/libenchant_myspell.so	23	%%HUNSPELL%%lib/enchant/libenchant_myspell.so
14	%%ZEMBEREK%%lib/enchant/libenchant_zemberek.a	24	%%HUNSPELL%%lib/enchant/libenchant_myspell.so.1
15	%%ZEMBEREK%%lib/enchant/libenchant_zemberek.so	25	%%HUNSPELL%%lib/enchant/libenchant_myspell.so.1.1.4
16	lib/libenchant.a
17	lib/libenchant.so
18	lib/libenchant.so.1
19	lib/libenchant.so.1.6.0
20	libdata/pkgconfig/enchant.pc	26	libdata/pkgconfig/enchant.pc
21	man/man1/enchant.1.gz	27	man/man1/enchant.1.gz
22	%%DATADIR%%/enchant.ordering

Return to bug 215083

Lines 2-35 Link Here

(-)textproc/enchant/Makefile (-19 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= enchant	4	PORTNAME= enchant
5	PORTVERSION= 1.6.0	5	PORTVERSION= 2.2.2
6	PORTREVISION= 6
7	CATEGORIES= textproc gnome	6	CATEGORIES= textproc gnome
8	MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/	7	DIST_SUBDIR= ${PORTNAME}
9	DIST_SUBDIR= gnome2
10		8
11	MAINTAINER= gnome@FreeBSD.org	9	MAINTAINER= gnome@FreeBSD.org
12	COMMENT= Dictionary/spellchecking framework	10	COMMENT= Dictionary/spellchecking framework
13		11
		12	LICENSE= LGPL21
		13	LICENSE_FILE= ${WRKSRC}/COPYING.LIB
		14
		15	USE_GITHUB= yes
		16	GH_ACCOUNT= AbiWord
		17	GH_TAGNAME= release-${PORTVERSION:C/\./-/g}
		18
14	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
15	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
16	USES= gmake libtool pathfix pkgconfig	21	USES= autoreconf gettext gmake libtool pathfix pkgconfig
17	USE_GNOME= glib20	22	USE_GNOME= glib20
18	CONFIGURE_ARGS= --disable-uspell \	23	CONFIGURE_ARGS= --disable-uspell
19	--disable-voikko
20		24
21	CPPFLAGS+= -I${LOCALBASE}/include	25	CPPFLAGS+= -I${LOCALBASE}/include
22	LDFLAGS+= -L${LOCALBASE}/lib	26	LDFLAGS+= -L${LOCALBASE}/lib
23		27
24	INSTALL_TARGET= install-strip	28	INSTALL_TARGET= install-strip
		29	TEST_TARGET= check
25		30
26	OPTIONS_MULTI= SPELL	31	OPTIONS_MULTI= SPELL
27	OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ISPELL ZEMBEREK	32	OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ISPELL
28	OPTIONS_DEFAULT=HUNSPELL	33	OPTIONS_DEFAULT=HUNSPELL
29	OPTIONS_SUB= yes	34	OPTIONS_SUB= yes
30	HSPELL_DESC= Spell checking via Hspell	35	HSPELL_DESC= Spell checking via Hspell
31	HUNSPELL_DESC= Spell checking via Hunspell	36	HUNSPELL_DESC= Spell checking via Hunspell
32	ZEMBEREK_DESC= Spell checking via Zemberek
33		37
34	ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell	38	ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
35	ASPELL_CONFIGURE_ENABLE= aspell	39	ASPELL_CONFIGURE_ENABLE= aspell
Lines 37-57 Link Here
37		41
38	HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:hebrew/hspell	42	HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:hebrew/hspell
39	HSPELL_CONFIGURE_ENABLE= hspell	43	HSPELL_CONFIGURE_ENABLE= hspell
40	HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE}	44	HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE} \
		45	--with-hspell-dir=${LOCALBASE}/share/hspell
41		46
42	HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell	47	HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell
43	HUNSPELL_CONFIGURE_ENABLE= myspell	48	HUNSPELL_CONFIGURE_ENABLE= myspell
44	HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \	49	HUNSPELL_CONFIGURE_ON= --with-myspell-dir=${LOCALBASE}/share/hunspell
45	--with-myspell-dir=${LOCALBASE}/share/hunspell
46		50
47	ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell	51	ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell
48	ISPELL_CONFIGURE_ENABLE= ispell	52	ISPELL_CONFIGURE_ENABLE= ispell
49		53
50	ZEMBEREK_LIb_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
51	ZEMBEREK_CONFIGURE_ENABLE= zemberek
52
53	post-patch:
54	@${REINPLACE_CMD} -e 's\|MKDIRPROG-mkdir\|MKDIRPROG-mkdir -p\|g' \
55	${WRKSRC}/install-sh
56
57	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Lines 1-9 Link Here

(-)textproc/enchant/files/patch-src_myspell_myspell__checker.cpp (-5 / +27 lines)
1	--- src/myspell/myspell_checker.cpp.orig 2010-04-01 20:53:37 UTC	1	--- src/myspell/myspell_checker.cpp.orig 2011-06-11 15:05:29 UTC
2	+++ src/myspell/myspell_checker.cpp	2	+++ src/myspell/myspell_checker.cpp
3	@@ -427,7 +427,7 @@ MySpellChecker::requestDictionary(const	3	@@ -39,7 +39,7 @@
4	if(myspell == NULL){	4	#include "enchant-provider.h"
5	return false;	5
6	}	6	#ifdef WITH_SYSTEM_MYSPELL
		7	-#include <myspell.hxx>
		8	+#include <hunspell/hunspell.hxx>
		9	#else
		10	#include "enchant_myspell.hxx"
		11	#endif
		12	@@ -66,7 +66,7 @@ public:
		13	private:
		14	GIConv m_translate_in; /* Selected translation from/to Unicode */
		15	GIConv m_translate_out;
		16	- MySpell *myspell;
		17	+ Hunspell *myspell;
		18	};
		19
		20	/***************************************************************************/
		21	@@ -247,10 +247,10 @@ MySpellChecker::requestDictionary(const
		22	aff = g_strdup(dic);
		23	int len_dic = strlen(dic);
		24	strcpy(aff+len_dic-3, "aff");
		25	- myspell = new MySpell(aff, dic);
		26	+ myspell = new Hunspell(aff, dic);
		27	g_free(dic);
		28	g_free(aff);
7	- char *enc = myspell->get_dic_encoding();	29	- char *enc = myspell->get_dic_encoding();
8	+ const char *enc = myspell->get_dic_encoding();	30	+ const char *enc = myspell->get_dic_encoding();
9		31