diff options
author | Larry Rosenman <ler@FreeBSD.org> | 2020-03-23 22:07:58 +0000 |
---|---|---|
committer | Larry Rosenman <ler@FreeBSD.org> | 2020-03-23 22:07:58 +0000 |
commit | 52a7893593d31ad34635e5cac65ada93f64e44d4 (patch) | |
tree | 8942d7ef06809a813e9d87bc55cf6ebae7a7b6d9 /mail/dovecot | |
parent | 695f4a436beb8c56d4ac57480ddd5aa5b61a812f (diff) | |
download | ports-52a7893593d31ad34635e5cac65ada93f64e44d4.tar.gz ports-52a7893593d31ad34635e5cac65ada93f64e44d4.zip |
mail/dovecot: use libexttextcat for lucene.
PR: 244932
Submitted by: igorz@yandex.ru
Notes
Notes:
svn path=/head/; revision=529013
Diffstat (limited to 'mail/dovecot')
-rw-r--r-- | mail/dovecot/Makefile | 8 | ||||
-rw-r--r-- | mail/dovecot/files/patch-configure | 19 | ||||
-rw-r--r-- | mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in | 11 | ||||
-rw-r--r-- | mail/dovecot/files/patch-src_lib-fts_Makefile.in | 11 | ||||
-rw-r--r-- | mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c | 11 | ||||
-rw-r--r-- | mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h | 10 |
6 files changed, 66 insertions, 4 deletions
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index eddffe5584ea..1db4bbfadd79 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -9,7 +9,7 @@ PORTNAME= dovecot PORTVERSION= 2.3.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ @@ -56,7 +56,7 @@ FTS_DESC= Full text search plugins ICU_DESC= Use libicu for FTS unicode normalization LUCENE_DESC= CLucene FTS support SOLR_DESC= Solr FTS support -TEXTCAT_DESC= Libtextcat FTS support +TEXTCAT_DESC= Libexttextcat FTS support GSSAPI_NONE_DESC= Build without GSSAPI support GSSAPI_BASE_DESC= Use GSSAPI from base @@ -99,7 +99,7 @@ SQLITE_CONFIGURE_WITH= sqlite ICU_CONFIGURE_WITH= icu ICU_LIB_DEPENDS= libicui18n.so:devel/icu -LUCENE_CONFIGURE_WITH= lucene +LUCENE_CONFIGURE_WITH= lucene stemmer LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene SOLR_CONFIGURE_WITH= solr @@ -107,7 +107,7 @@ SOLR_LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 TEXTCAT_CONFIGURE_WITH= textcat -TEXTCAT_LIB_DEPENDS= libtextcat.so:textproc/libtextcat +TEXTCAT_LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat # GSSAPI GSSAPI_NONE_CONFIGURE_ON= --without-gssapi diff --git a/mail/dovecot/files/patch-configure b/mail/dovecot/files/patch-configure new file mode 100644 index 000000000000..a199e838da39 --- /dev/null +++ b/mail/dovecot/files/patch-configure @@ -0,0 +1,19 @@ +--- configure.orig 2020-03-05 17:36:02.000000000 +0300 ++++ configure 2020-03-23 13:27:59.882228000 +0300 +@@ -28652,13 +28652,13 @@ + + + if test $want_stemmer != no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sb_stemmer_new in -lstemmer" >&5 +-$as_echo_n "checking for sb_stemmer_new in -lstemmer... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sb_stemmer_new in -lclucene-contribs-lib" >&5 ++$as_echo_n "checking for sb_stemmer_new in -lclucene-contribs-lib... " >&6; } + if ${ac_cv_lib_stemmer_sb_stemmer_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lstemmer $LIBS" ++LIBS="-lclucene-contribs-lib $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in b/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in new file mode 100644 index 000000000000..f8797ffcbada --- /dev/null +++ b/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in @@ -0,0 +1,11 @@ +--- src/plugins/fts-lucene/Makefile.in.orig ++++ src/plugins/fts-lucene/Makefile.in +@@ -516,7 +516,7 @@ + module_LTLIBRARIES = \ + lib21_fts_lucene_plugin.la + +-@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lstemmer ++@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lclucene-contribs-lib + @BUILD_FTS_STEMMER_TRUE@SHOWBALL_SOURCES = Snowball.cc + @BUILD_FTS_EXTTEXTCAT_FALSE@@BUILD_FTS_TEXTCAT_TRUE@TEXTCAT_LIBS = -ltextcat + @BUILD_FTS_EXTTEXTCAT_TRUE@TEXTCAT_LIBS = $(LIBEXTTEXTCAT_LIBS) diff --git a/mail/dovecot/files/patch-src_lib-fts_Makefile.in b/mail/dovecot/files/patch-src_lib-fts_Makefile.in new file mode 100644 index 000000000000..efa0f1952460 --- /dev/null +++ b/mail/dovecot/files/patch-src_lib-fts_Makefile.in @@ -0,0 +1,11 @@ +--- src/lib-fts/Makefile.in.orig ++++ src/lib-fts/Makefile.in +@@ -549,7 +549,7 @@ + word-break-data.c \ + stopwords/stopwords_malformed.txt + +-@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lstemmer ++@BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lclucene-contribs-lib + @BUILD_FTS_EXTTEXTCAT_FALSE@@BUILD_FTS_TEXTCAT_TRUE@TEXTCAT_LIBS = -ltextcat + @BUILD_FTS_EXTTEXTCAT_TRUE@TEXTCAT_LIBS = $(LIBEXTTEXTCAT_LIBS) + @BUILD_LIBICU_TRUE@ICU_SOURCES = fts-icu.c diff --git a/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c b/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c new file mode 100644 index 000000000000..0da23500cf98 --- /dev/null +++ b/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c @@ -0,0 +1,11 @@ +--- src/lib-fts/fts-filter-stemmer-snowball.c.orig ++++ src/lib-fts/fts-filter-stemmer-snowball.c +@@ -6,7 +6,7 @@ + + #ifdef HAVE_FTS_STEMMER + +-#include <libstemmer.h> ++#include <CLucene/snowball/libstemmer.h> + + struct fts_filter_stemmer_snowball { + struct fts_filter filter; diff --git a/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h b/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h new file mode 100644 index 000000000000..6169e121bc18 --- /dev/null +++ b/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h @@ -0,0 +1,10 @@ +--- src/plugins/fts-lucene/SnowballFilter.h.orig ++++ src/plugins/fts-lucene/SnowballFilter.h +@@ -8,7 +8,7 @@ + #define _lucene_analysis_snowball_filter_ + + #include "CLucene/analysis/AnalysisHeader.h" +-#include "libstemmer.h" ++#include "CLucene/snowball/libstemmer.h" + + CL_NS_DEF2(analysis,snowball) |