diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2015-12-12 16:47:12 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2015-12-12 16:47:12 +0000 |
| commit | 937e42438ad0de3537cc682e7ae862bab5112849 (patch) | |
| tree | cbc58959433ea5e7ec7e6929056fd6b0d15ed52d /mail/dovecot2 | |
| parent | e628da041ead378d646d6464d50df220d5a47eb9 (diff) | |
| download | ports-937e42438ad0de3537cc682e7ae862bab5112849.tar.gz ports-937e42438ad0de3537cc682e7ae862bab5112849.zip | |
Update dovecot2 to 2.2.21, and bump PORTREVISION in consumers.
While here, fix up some paths in the decode2text plugin, and add a note
to pkg-message about how to make it work. [1]
Changes:
- doveadm mailbox list (and some others) were broken in v2.2.20
- director: Fixed making backend changes when running with only a
single director server.
- virtual plugin: Fixed crash when trying to open nonexistent
autocreated backend mailbox.
PR: 205231 [1]
Submitted by: andrej@ebert.su
Notes
Notes:
svn path=/head/; revision=403608
Diffstat (limited to 'mail/dovecot2')
| -rw-r--r-- | mail/dovecot2/Makefile | 4 | ||||
| -rw-r--r-- | mail/dovecot2/distinfo | 4 | ||||
| -rw-r--r-- | mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh | 18 | ||||
| -rw-r--r-- | mail/dovecot2/files/pkg-message.in | 5 |
4 files changed, 28 insertions, 3 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index b05ba9d737d8..a386dada3a6c 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -13,7 +13,7 @@ ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.2.20 +PORTVERSION= 2.2.21 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ PKGNAMESUFFIX= 2 @@ -149,6 +149,8 @@ post-patch: @${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|${LOCALBASE}|' \ + ${WRKSRC}/src/plugins/fts/decode2text.sh post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR} diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo index c9af6ca87b71..13adc3be8876 100644 --- a/mail/dovecot2/distinfo +++ b/mail/dovecot2/distinfo @@ -1,2 +1,2 @@ -SHA256 (dovecot-2.2.20.tar.gz) = 9d8fd10bfc0d4d78c38b55bab7d88398bd785ce401fcf2e7c2ffb9eae0152dcd -SIZE (dovecot-2.2.20.tar.gz) = 5300971 +SHA256 (dovecot-2.2.21.tar.gz) = 7ab7139e59e1f0353bf9c24251f13c893cf1a6ef4bcc47e2d44de437108d0b20 +SIZE (dovecot-2.2.21.tar.gz) = 4985686 diff --git a/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh b/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh new file mode 100644 index 000000000000..036303ba8079 --- /dev/null +++ b/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh @@ -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& diff --git a/mail/dovecot2/files/pkg-message.in b/mail/dovecot2/files/pkg-message.in index ecf30bcd2213..7c722659d66a 100644 --- a/mail/dovecot2/files/pkg-message.in +++ b/mail/dovecot2/files/pkg-message.in @@ -14,4 +14,9 @@ dovecot_enable="YES" + + If you want to be able to search within attachments using the + decode2text plugin, you'll need to install textproc/catdoc, and + one of graphics/xpdf or graphics/poppler-utils. + --------------------------------------------------------------------- |