svn commit: r466176 - in head/textproc: . enchant enchant/files enchant2 enchant2/files
Koop Mast
kwm at FreeBSD.org
Sun Apr 1 18:50:54 UTC 2018
Author: kwm
Date: Sun Apr 1 18:50:52 2018
New Revision: 466176
URL: https://svnweb.freebsd.org/changeset/ports/466176
Log:
Copy enchant to enchant2 for the new version with shared library bump.
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 at FreeBSD.org
Added:
head/textproc/enchant/files/patch-src_enchant.c (contents, props changed)
head/textproc/enchant2/
- copied from r466160, head/textproc/enchant/
Deleted:
head/textproc/enchant2/files/patch-src_myspell_myspell__checker.cpp
Modified:
head/textproc/Makefile
head/textproc/enchant/Makefile
head/textproc/enchant/files/patch-configure
head/textproc/enchant/files/patch-src_myspell_myspell__checker.cpp
head/textproc/enchant/pkg-plist
head/textproc/enchant2/Makefile
head/textproc/enchant2/distinfo
head/textproc/enchant2/files/patch-configure
head/textproc/enchant2/pkg-descr
head/textproc/enchant2/pkg-plist
Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile Sun Apr 1 18:49:19 2018 (r466175)
+++ head/textproc/Makefile Sun Apr 1 18:50:52 2018 (r466176)
@@ -176,6 +176,7 @@
SUBDIR += en-hunspell
SUBDIR += en-mythes
SUBDIR += enchant
+ SUBDIR += enchant2
SUBDIR += eo-aspell
SUBDIR += eqe
SUBDIR += erlang-edown
Modified: head/textproc/enchant/Makefile
==============================================================================
--- head/textproc/enchant/Makefile Sun Apr 1 18:49:19 2018 (r466175)
+++ head/textproc/enchant/Makefile Sun Apr 1 18:50:52 2018 (r466176)
@@ -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>
Modified: head/textproc/enchant/files/patch-configure
==============================================================================
--- head/textproc/enchant/files/patch-configure Sun Apr 1 18:49:19 2018 (r466175)
+++ head/textproc/enchant/files/patch-configure Sun Apr 1 18:50:52 2018 (r466176)
@@ -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
Added: head/textproc/enchant/files/patch-src_enchant.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/textproc/enchant/files/patch-src_enchant.c Sun Apr 1 18:50:52 2018 (r466176)
@@ -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);
+ }
Modified: head/textproc/enchant/files/patch-src_myspell_myspell__checker.cpp
==============================================================================
--- head/textproc/enchant/files/patch-src_myspell_myspell__checker.cpp Sun Apr 1 18:49:19 2018 (r466175)
+++ head/textproc/enchant/files/patch-src_myspell_myspell__checker.cpp Sun Apr 1 18:50:52 2018 (r466176)
@@ -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;
}
Modified: head/textproc/enchant/pkg-plist
==============================================================================
--- head/textproc/enchant/pkg-plist Sun Apr 1 18:49:19 2018 (r466175)
+++ head/textproc/enchant/pkg-plist Sun Apr 1 18:50:52 2018 (r466176)
@@ -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
Modified: head/textproc/enchant2/Makefile
==============================================================================
--- head/textproc/enchant/Makefile Sun Apr 1 14:24:09 2018 (r466160)
+++ head/textproc/enchant2/Makefile Sun Apr 1 18:50:52 2018 (r466176)
@@ -2,29 +2,28 @@
# $FreeBSD$
PORTNAME= enchant
-PORTVERSION= 1.6.0
-PORTREVISION= 7
+PORTVERSION= 2.2.3
CATEGORIES= textproc gnome
-MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
-DIST_SUBDIR= gnome2
+MASTER_SITES= https://github.com/AbiWord/enchant/releases/download/v${PORTVERSION}/
+PKGNAMESUFFIX= 2
MAINTAINER= gnome at FreeBSD.org
COMMENT= Dictionary/spellchecking framework
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/COPYING.LIB
+
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= gmake libtool pathfix pkgconfig
+USES= gmake libtool localbase pathfix pkgconfig
USE_GNOME= glib20
-CONFIGURE_ARGS= --disable-uspell \
- --disable-voikko
+CONFIGURE_ARGS= --without-applespell \
+ --without-voikko
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
INSTALL_TARGET= install-strip
OPTIONS_MULTI= SPELL
-OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ISPELL ZEMBEREK
+OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ZEMBEREK
OPTIONS_DEFAULT=HUNSPELL
OPTIONS_SUB= yes
HSPELL_DESC= Spell checking via Hspell
@@ -32,23 +31,20 @@ HUNSPELL_DESC= Spell checking via Hunspell
ZEMBEREK_DESC= Spell checking via Zemberek
ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
-ASPELL_CONFIGURE_ENABLE= aspell
-ASPELL_CONFIGURE_ON= --with-aspell-prefix=${LOCALBASE}
+ASPELL_CONFIGURE_WITH= aspell
+ASPELL_CONFIGURE_ON= --with-aspell-dir=${LOCALBASE}/share/aspell
-HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:hebrew/hspell
-HSPELL_CONFIGURE_ENABLE= hspell
-HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE}
+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_ENABLE= myspell
-HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \
- --with-myspell-dir=${LOCALBASE}/share/hunspell
+HUNSPELL_CONFIGURE_WITH= hunspell
+HUNSPELL_CONFIGURE_ON= --with-hunspell-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
+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' \
Modified: head/textproc/enchant2/distinfo
==============================================================================
--- head/textproc/enchant/distinfo Sun Apr 1 14:24:09 2018 (r466160)
+++ head/textproc/enchant2/distinfo Sun Apr 1 18:50:52 2018 (r466176)
@@ -1,2 +1,3 @@
-SHA256 (gnome2/enchant-1.6.0.tar.gz) = 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f
-SIZE (gnome2/enchant-1.6.0.tar.gz) = 607018
+TIMESTAMP = 1522593522
+SHA256 (enchant-2.2.3.tar.gz) = abd8e915675cff54c0d4da5029d95c528362266557c61c7149d53fa069b8076d
+SIZE (enchant-2.2.3.tar.gz) = 957451
Modified: head/textproc/enchant2/files/patch-configure
==============================================================================
--- head/textproc/enchant/files/patch-configure Sun Apr 1 14:24:09 2018 (r466160)
+++ head/textproc/enchant2/files/patch-configure Sun Apr 1 18:50:52 2018 (r466176)
@@ -1,11 +1,10 @@
---- configure.orig 2013-08-16 18:30:56.000000000 +0200
-+++ configure 2013-08-16 18:31:33.000000000 +0200
-@@ -18213,7 +18213,7 @@
- fi
+--- configure.orig 2018-04-01 16:42:52.206302000 +0200
++++ configure 2018-04-01 16:45:42.802072000 +0200
+@@ -23534,7 +23534,6 @@
-- 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; }
+
+- p
+ # When compiling with GCC, prefer -isystem to -I when including system
+ # include files, to avoid generating useless diagnostics for the files.
+ ISYSTEM='-isystem '
Modified: head/textproc/enchant2/pkg-descr
==============================================================================
--- head/textproc/enchant/pkg-descr Sun Apr 1 14:24:09 2018 (r466160)
+++ head/textproc/enchant2/pkg-descr Sun Apr 1 18:50:52 2018 (r466176)
@@ -1,16 +1,10 @@
-On the surface, Enchant appears to be a generic spell checking library. You
-can request dictionaries from it, ask if a word is correctly spelled, get
-corrections for a misspelled word, etc...
+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.
-Beneath the surface, Enchant is a whole lot more - and less - than that.
-You'll see that Enchant isn't really a spell checking library at all.
+Enchant can be configured by the user, who can even add spell-checker
+plugins if desired.
-"What's that?" you ask. Well, Enchant doesn't try to do any of the work
-itself. It's lazy, and requires backends to do most of its dirty work. Looking
-closer, you'll see the Enchant is more-or-less a fancy wrapper around the
-dlopen() system call. Enchant steps in to provide uniformity and conformity
-on top of these libraries, and implement certain features that may be lacking
-in any individual provider library. Everything should "just work" for any and
-every definition of "just working."
-
-WWW: http://www.abisource.com/projects/enchant/
+WWW: https://abiword.github.io/enchant/
Modified: head/textproc/enchant2/pkg-plist
==============================================================================
--- head/textproc/enchant/pkg-plist Sun Apr 1 14:24:09 2018 (r466160)
+++ head/textproc/enchant2/pkg-plist Sun Apr 1 18:50:52 2018 (r466176)
@@ -1,22 +1,21 @@
-bin/enchant
-bin/enchant-lsmod
-include/enchant/enchant++.h
-include/enchant/enchant-provider.h
-include/enchant/enchant.h
-%%ASPELL%%lib/enchant/libenchant_aspell.a
-%%ASPELL%%lib/enchant/libenchant_aspell.so
-%%HSPELL%%lib/enchant/libenchant_hspell.a
-%%HSPELL%%lib/enchant/libenchant_hspell.so
-%%ISPELL%%lib/enchant/libenchant_ispell.a
-%%ISPELL%%lib/enchant/libenchant_ispell.so
-%%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
-libdata/pkgconfig/enchant.pc
-man/man1/enchant.1.gz
+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
More information about the svn-ports-head
mailing list