mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-17 08:01:36 +00:00
Code Issues Releases Activity

Copy enchant to enchant2 for the new version with shared library bump.

Browse Source 
Fix typo in ZEMBEREK lib depends line and add missing dependancy.
Rename sorting file in textproc/enchant to fix conflict with textproc/enchant2.

PR:		215083 (based on)
Submitted by:	thierry@FreeBSD.org
This commit is contained in:
Koop Mast 2018-04-01 18:50:52 +00:00
parent 1523527acd
commit c2bbf93dfc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=466176
11 changed files with 121 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
textproc/Makefile
View File

@ -176,6 +176,7 @@
SUBDIR += en-hunspell
SUBDIR += en-mythes
SUBDIR += enchant
SUBDIR += enchant2
SUBDIR += eo-aspell
SUBDIR += eqe
SUBDIR += erlang-edown

9
textproc/enchant/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= enchant
PORTVERSION= 1.6.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= textproc gnome
MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
DIST_SUBDIR= gnome2
@ -47,11 +47,16 @@ HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \
ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell
ISPELL_CONFIGURE_ENABLE= ispell
ZEMBEREK_LIb_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
ZEMBEREK_LIB_DEPENDS= libdbus-1.so:devel/dbus \
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
post-install:
@cd ${STAGEDIR}${PREFIX}/share/enchant/ && \
${MV} enchant.ordering enchant1.ordering
.include <bsd.port.mk>

6
textproc/enchant/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2013-08-16 18:30:56.000000000 +0200
+++ configure 2013-08-16 18:31:33.000000000 +0200
@@ -18213,7 +18213,7 @@
--- configure.orig 2010-04-01 20:56:39 UTC
+++ configure
@@ -18213,7 +18213,7 @@ if test "x$ac_cv_lib_aspell_get_aspell_dict_info_list"
fi

11
textproc/enchant/files/patch-src_enchant.c Normal file
View File

@ -0,0 +1,11 @@
--- src/enchant.c.orig 2018-04-01 15:42:47 UTC
+++ src/enchant.c
@@ -1558,7 +1558,7 @@ enchant_load_provider_ordering (EnchantBroker * broker
for (iter = conf_dirs; iter; iter = iter->next)
{
char *ordering_file;
- ordering_file = g_build_filename (iter->data, "enchant.ordering", NULL);
+ ordering_file = g_build_filename (iter->data, "enchant1.ordering", NULL);
enchant_load_ordering_from_file (broker, ordering_file);
g_free (ordering_file);
}

2
textproc/enchant/files/patch-src_myspell_myspell__checker.cpp
View File

@ -1,6 +1,6 @@
--- src/myspell/myspell_checker.cpp.orig 2010-04-01 20:53:37 UTC
+++ src/myspell/myspell_checker.cpp
@@ -427,7 +427,7 @@ MySpellChecker::requestDictionary(const
@@ -427,7 +427,7 @@ MySpellChecker::requestDictionary(const char *szLang)
if(myspell == NULL){
return false;
}

2
textproc/enchant/pkg-plist
View File

@ -19,4 +19,4 @@ lib/libenchant.so.1
lib/libenchant.so.1.6.0
libdata/pkgconfig/enchant.pc
man/man1/enchant.1.gz
%%DATADIR%%/enchant.ordering
%%DATADIR%%/enchant1.ordering

53
textproc/enchant2/Makefile Normal file
View File

@ -0,0 +1,53 @@
# Created by: Adam Weinberger <adamw@FreeBSD.org>
# $FreeBSD$
PORTNAME= enchant
PORTVERSION= 2.2.3
CATEGORIES= textproc gnome
MASTER_SITES= https://github.com/AbiWord/enchant/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX= 2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Dictionary/spellchecking framework
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USES= gmake libtool localbase pathfix pkgconfig
USE_GNOME= glib20
CONFIGURE_ARGS= --without-applespell \
--without-voikko
INSTALL_TARGET= install-strip
OPTIONS_MULTI= SPELL
OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ZEMBEREK
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_WITH= aspell
ASPELL_CONFIGURE_ON= --with-aspell-dir=${LOCALBASE}/share/aspell
HSPELL_LIB_DEPENDS= libhspell.so.0:hebrew/hspell
HSPELL_CONFIGURE_WITH= hspell
HSPELL_CONFIGURE_ON= --with-hspell-dir=${LOCALBASE}/share/hspell
HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
HUNSPELL_CONFIGURE_WITH= hunspell
HUNSPELL_CONFIGURE_ON= --with-hunspell-dir=${LOCALBASE}/share/hunspell
ZEMBEREK_LIB_DEPENDS= libdbus-1.so:devel/dbus \
libdbus-glib-1.so:devel/dbus-glib
ZEMBEREK_CONFIGURE_WITH= zemberek
post-patch:
@${REINPLACE_CMD} -e 's|MKDIRPROG-mkdir|MKDIRPROG-mkdir -p|g' \
${WRKSRC}/install-sh
.include <bsd.port.mk>

3
textproc/enchant2/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1522593522
SHA256 (enchant-2.2.3.tar.gz) = abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d
SIZE (enchant-2.2.3.tar.gz) = 957451

10
textproc/enchant2/files/patch-configure Normal file
View File

@ -0,0 +1,10 @@
--- configure.orig 2018-04-01 16:42:52.206302000 +0200
+++ configure 2018-04-01 16:45:42.802072000 +0200
@@ -23534,7 +23534,6 @@
- p
# When compiling with GCC, prefer -isystem to -I when including system
# include files, to avoid generating useless diagnostics for the files.
ISYSTEM='-isystem '

10
textproc/enchant2/pkg-descr Normal file
View File

@ -0,0 +1,10 @@
Enchant aims to provide a simple but comprehensive abstraction for dealing
with different spell checking libraries in a consistent way. A client, such
as a text editor or word processor, need not know anything about a specific
spell-checker, and since all back-ends are plugins, new spell-checkers can
be added without needing any change to the program using Enchant.
Enchant can be configured by the user, who can even add spell-checker
plugins if desired.
WWW: https://abiword.github.io/enchant/

21
textproc/enchant2/pkg-plist Normal file
View File

@ -0,0 +1,21 @@
bin/enchant-2
bin/enchant-lsmod-2
include/enchant-2/enchant++.h
include/enchant-2/enchant-provider.h
include/enchant-2/enchant.h
%%ASPELL%%lib/enchant-2/enchant_aspell.a
%%ASPELL%%lib/enchant-2/enchant_aspell.so
%%HSPELL%%lib/enchant-2/enchant_hspell.a
%%HSPELL%%lib/enchant-2/enchant_hspell.so
%%HUNSPELL%%lib/enchant-2/enchant_hunspell.a
%%HUNSPELL%%lib/enchant-2/enchant_hunspell.so
%%ZEMBEREK%%lib/enchant-2/enchant_zemberek.a
%%ZEMBEREK%%lib/enchant-2/enchant_zemberek.so
lib/libenchant-2.a
lib/libenchant-2.so
lib/libenchant-2.so.2
lib/libenchant-2.so.2.2.3
libdata/pkgconfig/enchant-2.pc
man/man1/enchant-2.1.gz
man/man1/enchant-lsmod-2.1.gz
%%DATADIR%%/enchant.ordering