--- dovecot/Makefile	2020-03-13 12:47:16.000000000 +0300
+++ dovecot-clucene/Makefile	2020-03-23 21:50:51.150300000 +0300
@@ -56,7 +56,7 @@
 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 @@
 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 @@
 			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
--- dovecot/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
+++ dovecot-clucene/files/patch-configure	2020-03-23 13:30:16.242930000 +0300
@@ -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.  */
+ 
--- dovecot/files/patch-plugins_fts-lucene_Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ dovecot-clucene/files/patch-plugins_fts-lucene_Makefile.in	2020-03-23 17:19:16.504898000 +0300
@@ -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)
--- dovecot/files/patch-src_lib-fts_Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ dovecot-clucene/files/patch-src_lib-fts_Makefile.in	2020-03-23 17:19:50.583506000 +0300
@@ -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
--- dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c	1970-01-01 03:00:00.000000000 +0300
+++ dovecot-clucene/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c	2020-03-23 20:50:08.596948000 +0300
@@ -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;
--- dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h	1970-01-01 03:00:00.000000000 +0300
+++ dovecot-clucene/files/patch-src_plugins_fts-lucene_SnowballFilter.h	2020-03-23 17:20:35.860308000 +0300
@@ -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)