Index: textproc/enchant/Makefile =================================================================== --- textproc/enchant/Makefile (revision 427922) +++ textproc/enchant/Makefile (working copy) @@ -2,34 +2,38 @@ # $FreeBSD$ PORTNAME= enchant -PORTVERSION= 1.6.0 -PORTREVISION= 6 +PORTVERSION= 2.2.2 CATEGORIES= textproc gnome -MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/ -DIST_SUBDIR= gnome2 +DIST_SUBDIR= ${PORTNAME} 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= gmake libtool pathfix pkgconfig +USES= autoreconf gettext gmake libtool pathfix pkgconfig USE_GNOME= glib20 -CONFIGURE_ARGS= --disable-uspell \ - --disable-voikko +CONFIGURE_ARGS= --disable-uspell 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 ZEMBEREK +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 @@ -37,21 +41,14 @@ HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:hebrew/hspell HSPELL_CONFIGURE_ENABLE= hspell -HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE} +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-system-myspell=yes \ - --with-myspell-dir=${LOCALBASE}/share/hunspell +HUNSPELL_CONFIGURE_ON= --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 Index: textproc/enchant/distinfo =================================================================== --- textproc/enchant/distinfo (revision 427922) +++ textproc/enchant/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (gnome2/enchant-1.6.0.tar.gz) = 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f -SIZE (gnome2/enchant-1.6.0.tar.gz) = 607018 +TIMESTAMP = 1480870868 +SHA256 (enchant/AbiWord-enchant-2.2.2-release-2-2-2_GH0.tar.gz) = 17d8c11c3f9628c14c50636480b91bf231ef02e2dc4ad7f1950f866000289fed +SIZE (enchant/AbiWord-enchant-2.2.2-release-2-2-2_GH0.tar.gz) = 119932 Index: textproc/enchant/files/patch-configure =================================================================== --- textproc/enchant/files/patch-configure (revision 427922) +++ textproc/enchant/files/patch-configure (nonexistent) @@ -1,11 +0,0 @@ ---- configure.orig 2013-08-16 18:30:56.000000000 +0200 -+++ configure 2013-08-16 18:31:33.000000000 +0200 -@@ -18213,7 +18213,7 @@ - fi - - -- ASPELL_CFLAGS+=" -DHAVE_PSPELL_H" -+ ASPELL_CFLAGS="${ASPELL_CFLAGS} -DHAVE_PSPELL_H" - elif test -f "$aspell_prefix/include/aspell.h"; then - { $as_echo "$as_me:$LINENO: result: yes (aspell)" >&5 - $as_echo "yes (aspell)" >&6; } Property changes on: textproc/enchant/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: textproc/enchant/files/patch-configure.in =================================================================== --- textproc/enchant/files/patch-configure.in (nonexistent) +++ textproc/enchant/files/patch-configure.in (working copy) @@ -0,0 +1,11 @@ +--- configure.in.orig 2011-06-11 15:05:29 UTC ++++ configure.in +@@ -102,7 +102,7 @@ fi + + with_system_myspell=no + if test "x$build_myspell" != "xno"; then +- PKG_CHECK_MODULES(MYSPELL, myspell, with_system_myspell=yes, with_system_myspell=no) ++ PKG_CHECK_MODULES(MYSPELL, hunspell, with_system_myspell=yes, with_system_myspell=no) + fi + AM_CONDITIONAL(WITH_SYSTEM_MYSPELL, test "x$with_system_myspell" = "xyes") + Property changes on: textproc/enchant/files/patch-configure.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: textproc/enchant/files/patch-src_myspell_myspell__checker.cpp =================================================================== --- textproc/enchant/files/patch-src_myspell_myspell__checker.cpp (revision 427922) +++ textproc/enchant/files/patch-src_myspell_myspell__checker.cpp (working copy) @@ -1,9 +1,31 @@ ---- src/myspell/myspell_checker.cpp.orig 2010-04-01 20:53:37 UTC +--- src/myspell/myspell_checker.cpp.orig 2011-06-11 15:05:29 UTC +++ src/myspell/myspell_checker.cpp -@@ -427,7 +427,7 @@ MySpellChecker::requestDictionary(const - if(myspell == NULL){ - return false; - } +@@ -39,7 +39,7 @@ + #include "enchant-provider.h" + + #ifdef WITH_SYSTEM_MYSPELL +-#include ++#include + #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(); Index: textproc/enchant/pkg-plist =================================================================== --- textproc/enchant/pkg-plist (revision 427922) +++ textproc/enchant/pkg-plist (working copy) @@ -1,22 +1,27 @@ bin/enchant bin/enchant-lsmod -include/enchant/enchant++.h include/enchant/enchant-provider.h include/enchant/enchant.h +include/enchant/enchant++.h +lib/libenchant.a +lib/libenchant.so +lib/libenchant.so.1 +lib/libenchant.so.1.1.4 %%ASPELL%%lib/enchant/libenchant_aspell.a %%ASPELL%%lib/enchant/libenchant_aspell.so +%%ASPELL%%lib/enchant/libenchant_aspell.so.1 +%%ASPELL%%lib/enchant/libenchant_aspell.so.1.1.4 %%HSPELL%%lib/enchant/libenchant_hspell.a %%HSPELL%%lib/enchant/libenchant_hspell.so +%%HSPELL%%lib/enchant/libenchant_hspell.so.1 +%%HSPELL%%lib/enchant/libenchant_hspell.so.1.1.4 %%ISPELL%%lib/enchant/libenchant_ispell.a %%ISPELL%%lib/enchant/libenchant_ispell.so +%%ISPELL%%lib/enchant/libenchant_ispell.so.1 +%%ISPELL%%lib/enchant/libenchant_ispell.so.1.1.4 %%HUNSPELL%%lib/enchant/libenchant_myspell.a %%HUNSPELL%%lib/enchant/libenchant_myspell.so -%%ZEMBEREK%%lib/enchant/libenchant_zemberek.a -%%ZEMBEREK%%lib/enchant/libenchant_zemberek.so -lib/libenchant.a -lib/libenchant.so -lib/libenchant.so.1 -lib/libenchant.so.1.6.0 +%%HUNSPELL%%lib/enchant/libenchant_myspell.so.1 +%%HUNSPELL%%lib/enchant/libenchant_myspell.so.1.1.4 libdata/pkgconfig/enchant.pc man/man1/enchant.1.gz -%%DATADIR%%/enchant.ordering