[Midnightbsd-cvs] mports [21374] trunk/mail/dovecot2: dovecot 2.2.21

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 15 11:02:05 EDT 2016 

Revision: 21374
          http://svnweb.midnightbsd.org/mports/?rev=21374
Author:   laffer1
Date:     2016-05-15 11:01:05 -0400 (Sun, 15 May 2016)
Log Message:
-----------
dovecot 2.2.21

Modified Paths:
--------------
    trunk/mail/dovecot2/Makefile
    trunk/mail/dovecot2/distinfo
    trunk/mail/dovecot2/pkg-plist

Added Paths:
-----------
    trunk/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh

Modified: trunk/mail/dovecot2/Makefile
===================================================================
--- trunk/mail/dovecot2/Makefile	2016-05-14 19:56:25 UTC (rev 21373)
+++ trunk/mail/dovecot2/Makefile	2016-05-15 15:01:05 UTC (rev 21374)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.19
+PORTVERSION=	2.2.21
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
@@ -33,7 +33,7 @@
 USERS=		dovecot dovenull
 GROUPS=		${USERS}
 
-OPTIONS_DEFINE=	GC KQUEUE LIBWRAP LZ4 SSL VPOPMAIL DOCS EXAMPLES
+OPTIONS_DEFINE=	KQUEUE LIBWRAP LZ4 SSL VPOPMAIL DOCS EXAMPLES
 OPTIONS_DEFAULT=KQUEUE SSL GSSAPI_NONE
 OPTIONS_SUB=	yes
 
@@ -44,7 +44,6 @@
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
-GC_DESC=	Garbage collection with boehm-gc
 KQUEUE_DESC=	kqueue(2) support
 LZ4_DESC=	LZ4 compression support
 VPOPMAIL_DESC=	vpopmail support
@@ -66,9 +65,6 @@
 CDB_CONFIGURE_WITH=	cdb
 CDB_LIB_DEPENDS=	libcdb.so:${PORTSDIR}/databases/tinycdb
 
-GC_CONFIGURE_WITH=	gc
-GC_LIB_DEPENDS=		libgc.so:${PORTSDIR}/devel/boehm-gc
-
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi ${GSSAPI_CONFIGURE_ARGS}
@@ -86,7 +82,6 @@
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap
-LDAP_RC_REQUIRE=	slapd
 
 LIBWRAP_CONFIGURE_WITH=	libwrap
 
@@ -97,11 +92,9 @@
 
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_WITH=	mysql
-MYSQL_RC_REQUIRE=	mysql
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
-PGSQL_RC_REQUIRE=	postgresql
 
 SOLR_CONFIGURE_WITH=	solr
 SOLR_BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
@@ -122,21 +115,21 @@
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-.include <bsd.mport.options.mk>
-
-CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
-LDFLAGS+=	-L${LOCALBASE}/lib -I${OPENSSLLIB}
-
 # Default requirement for dovecot rc script
 _REQUIRE=	LOGIN
 
-.for opt in ${PORT_OPTIONS}
-_REQUIRE+=	${${opt}_RC_REQUIRE}
-.endfor
+LDAP_VARS=	_REQUIRE+=slapd
+MYSQL_VARS=	_REQUIRE+=mysql
+PGSQL_VARS=	_REQUIRE+=postgresql
 
+.include <bsd.mport.options.mk>
+
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 SUB_FILES+=	pkg-message
 
+CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
+LDFLAGS+=	-L${LOCALBASE}/lib -I${OPENSSLLIB}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \
 		s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \
@@ -150,8 +143,9 @@
 
 post-configure:
 	${REINPLACE_CMD} 's|#define HAVE_CLEARENV 1||g' ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e '/^[^#]/s|/usr|${LOCALBASE}|' \
+		${WRKSRC}/src/plugins/fts/decode2text.sh
 
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR}

Modified: trunk/mail/dovecot2/distinfo
===================================================================
--- trunk/mail/dovecot2/distinfo	2016-05-14 19:56:25 UTC (rev 21373)
+++ trunk/mail/dovecot2/distinfo	2016-05-15 15:01:05 UTC (rev 21374)
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.2.19.tar.gz) = 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f
-SIZE (dovecot-2.2.19.tar.gz) = 5256627
+SHA256 (dovecot-2.2.21.tar.gz) = 7ab7139e59e1f0353bf9c24251f13c893cf1a6ef4bcc47e2d44de437108d0b20
+SIZE (dovecot-2.2.21.tar.gz) = 4985686

Added: trunk/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh
===================================================================
--- trunk/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh	                        (rev 0)
+++ trunk/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh	2016-05-15 15:01:05 UTC (rev 21374)
@@ -0,0 +1,18 @@
+/usr gets changed to ${LOCALBASE} in post-patch:, so we
+cheat and set xpdf's path to /usr/lib.
+
+--- src/plugins/fts/decode2text.sh.orig	2015-12-12 16:32:01 UTC
++++ src/plugins/fts/decode2text.sh
+@@ -79,7 +79,11 @@ wait_timeout() {
+ LANG=en_US.UTF-8
+ export LANG
+ if [ $fmt = "pdf" ]; then
+-  /usr/bin/pdftotext $path - 2>/dev/null&
++  if [ -x /usr/lib/xpdf/pdftotext ]; then
++    /usr/lib/xpdf/pdftotext $path - 2>/dev/null&
++  else
++    /usr/bin/pdftotext $path - 2>/dev/null&
++  fi
+   wait_timeout 2>/dev/null
+ elif [ $fmt = "doc" ]; then
+   (/usr/bin/catdoc $path; true) 2>/dev/null&


Property changes on: trunk/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh
___________________________________________________________________
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
Modified: trunk/mail/dovecot2/pkg-plist
===================================================================
--- trunk/mail/dovecot2/pkg-plist	2016-05-14 19:56:25 UTC (rev 21373)
+++ trunk/mail/dovecot2/pkg-plist	2016-05-15 15:01:05 UTC (rev 21374)
@@ -149,7 +149,9 @@
 include/dovecot/fts-icu.h
 include/dovecot/fts-indexer.h
 include/dovecot/fts-language.h
+include/dovecot/fts-library.h
 include/dovecot/fts-parser.h
+include/dovecot/fts-storage.h
 include/dovecot/fts-tokenizer-generic-private.h
 include/dovecot/fts-tokenizer-private.h
 include/dovecot/fts-tokenizer.h
@@ -302,6 +304,7 @@
 include/dovecot/login-proxy.h
 include/dovecot/login-settings.h
 include/dovecot/macros.h
+include/dovecot/mail-autoexpunge.h
 include/dovecot/mail-cache-private.h
 include/dovecot/mail-cache.h
 include/dovecot/mail-copy.h
@@ -712,6 +715,8 @@
 %%DATADIR%%/stopwords/stopwords_en.txt
 %%DATADIR%%/stopwords/stopwords_fi.txt
 %%DATADIR%%/stopwords/stopwords_fr.txt
+%%DATADIR%%/stopwords/stopwords_no.txt
+%%DATADIR%%/stopwords/stopwords_sv.txt
 %%LIBWRAP%%libexec/dovecot/tcpwrap
 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a
 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so
@@ -721,4 +726,4 @@
 %%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so
 %%SSL%%lib/dovecot/libssl_iostream_openssl.a
 %%SSL%%lib/dovecot/libssl_iostream_openssl.so
- at unexec echo "If you are removing dovecot2 permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."
+ at postunexec echo "If you are removing dovecot2 permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."

More information about the Midnightbsd-cvs mailing list