Index: head/mail/dovecot/Makefile =================================================================== --- head/mail/dovecot/Makefile (revision 529012) +++ head/mail/dovecot/Makefile (revision 529013) @@ -1,162 +1,162 @@ # Created by: Nagy, Attila # $FreeBSD$ ###################################################################### # Anytime PORTVERSION changes please bump PORTREVISION of: # # - mail/dovecot-pigeonhole. See ports/146029 for an explanation. # # - mail/dovecot-fts-xapian. # ###################################################################### PORTNAME= dovecot PORTVERSION= 2.3.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ MAINTAINER= ler@FreeBSD.org COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual USES= cpe iconv libtool pkgconfig ssl USE_RC_SUBR= dovecot GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow \ --with-ssl=openssl \ --with-docs USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 VPOPMAIL DOCS EXAMPLES OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP OPTIONS_SUB= yes OPTIONS_GROUP= DB FTS OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT LZ4_DESC= LZ4 compression support VPOPMAIL_DESC= vpopmail support DB_DESC= Database support CDB_DESC= CDB database support 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 GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 # General options LIBSODIUM_DESC= support libsodium based crypts (ARGON2I/ARGON2ID) LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium LIBSODIUM_CONFIGURE_WITH= sodium LIBWRAP_CONFIGURE_WITH= libwrap LUA_CONFIGURE_WITH= lua LUA_USES= lua LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 VPOPMAIL_BUILD_DEPENDS= vpopmail>=0:mail/vpopmail VPOPMAIL_CONFIGURE_WITH=vpopmail # Databases CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql SQLITE_USES= sqlite SQLITE_CONFIGURE_WITH= sqlite # FTS 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 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 GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit DOCS= AUTHORS COPYING INSTALL NEWS TODO README PORTDOCS= * PORTEXAMPLES= * # Default requirement for dovecot rc script _REQUIRE= LOGIN LDAP_VARS= _REQUIRE+=slapd MYSQL_VARS= _REQUIRE+=mysql PGSQL_VARS= _REQUIRE+=postgresql SUB_LIST+= REQUIRE="${_REQUIRE}" SUB_FILES+= pkg-message CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} post-patch: @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* @${REINPLACE_CMD} -e '/^LIBS =/s/$$/ @LTLIBICONV@/' \ ${WRKSRC}/src/lib-mail/Makefile.in # Install the sample config files into ETCDIR/example-config/ @${REINPLACE_CMD} -e '/^exampledir =/s|\$$(docdir)|${ETCDIR}|' \ ${WRKSRC}/doc/example-config/Makefile.in \ ${WRKSRC}/doc/example-config/conf.d/Makefile.in @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' \ ${WRKSRC}/src/plugins/fts/decode2text.sh post-patch-LUA-on: @${REINPLACE_CMD} -e '/^libdovecot_lua_la_DEPENDENCIES =/ s|LUA_LIBS|true|' \ ${WRKSRC}/src/lib-lua/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/mail/dovecot/files/patch-configure =================================================================== --- head/mail/dovecot/files/patch-configure (nonexistent) +++ head/mail/dovecot/files/patch-configure (revision 529013) @@ -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. */ + Property changes on: head/mail/dovecot/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in =================================================================== --- head/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in (nonexistent) +++ head/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in (revision 529013) @@ -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) Property changes on: head/mail/dovecot/files/patch-plugins_fts-lucene_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/dovecot/files/patch-src_lib-fts_Makefile.in =================================================================== --- head/mail/dovecot/files/patch-src_lib-fts_Makefile.in (nonexistent) +++ head/mail/dovecot/files/patch-src_lib-fts_Makefile.in (revision 529013) @@ -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 Property changes on: head/mail/dovecot/files/patch-src_lib-fts_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c =================================================================== --- head/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c (nonexistent) +++ head/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c (revision 529013) @@ -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 ++#include + + struct fts_filter_stemmer_snowball { + struct fts_filter filter; Property changes on: head/mail/dovecot/files/patch-src_lib-fts_fts-filter-stemmer-snowball.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h =================================================================== --- head/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h (nonexistent) +++ head/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h (revision 529013) @@ -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) Property changes on: head/mail/dovecot/files/patch-src_plugins_fts-lucene_SnowballFilter.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property