svn commit: r529013 - in head/mail/dovecot: . files
Larry Rosenman
ler at FreeBSD.org
Mon Mar 23 22:08:00 UTC 2020
Author: ler
Date: Mon Mar 23 22:07:58 2020
New Revision: 529013
URL: https://svnweb.freebsd.org/changeset/ports/529013
Log:
mail/dovecot: use libexttextcat for lucene.
PR: 244932
Submitted by: igorz at yandex.ru
Added:
head/mail/dovecot/files/patch-configure (contents, props changed)
head/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in (contents, props changed)
head/mail/dovecot/files/patch-src_lib-fts_Makefile.in (contents, props changed)
head/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c (contents, props changed)
head/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h (contents, props changed)
Modified:
head/mail/dovecot/Makefile
Modified: head/mail/dovecot/Makefile
==============================================================================
--- head/mail/dovecot/Makefile Mon Mar 23 22:03:28 2020 (r529012)
+++ head/mail/dovecot/Makefile Mon Mar 23 22:07:58 2020 (r529013)
@@ -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
Added: head/mail/dovecot/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dovecot/files/patch-configure Mon Mar 23 22:07:58 2020 (r529013)
@@ -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. */
+
Added: head/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in Mon Mar 23 22:07:58 2020 (r529013)
@@ -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
+
+- at BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lstemmer
++ at BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lclucene-contribs-lib
+ @BUILD_FTS_STEMMER_TRUE at SHOWBALL_SOURCES = Snowball.cc
+ @BUILD_FTS_EXTTEXTCAT_FALSE@@BUILD_FTS_TEXTCAT_TRUE at TEXTCAT_LIBS = -ltextcat
+ @BUILD_FTS_EXTTEXTCAT_TRUE at TEXTCAT_LIBS = $(LIBEXTTEXTCAT_LIBS)
Added: head/mail/dovecot/files/patch-src_lib-fts_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dovecot/files/patch-src_lib-fts_Makefile.in Mon Mar 23 22:07:58 2020 (r529013)
@@ -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
+
+- at BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lstemmer
++ at BUILD_FTS_STEMMER_TRUE@STEMMER_LIBS = -lclucene-contribs-lib
+ @BUILD_FTS_EXTTEXTCAT_FALSE@@BUILD_FTS_TEXTCAT_TRUE at TEXTCAT_LIBS = -ltextcat
+ @BUILD_FTS_EXTTEXTCAT_TRUE at TEXTCAT_LIBS = $(LIBEXTTEXTCAT_LIBS)
+ @BUILD_LIBICU_TRUE at ICU_SOURCES = fts-icu.c
Added: head/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c Mon Mar 23 22:07:58 2020 (r529013)
@@ -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;
Added: head/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h Mon Mar 23 22:07:58 2020 (r529013)
@@ -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)
More information about the svn-ports-head
mailing list