From owner-svn-ports-all@freebsd.org Sat Dec 12 16:47:14 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26560A3BC26; Sat, 12 Dec 2015 16:47:14 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB87E1DC2; Sat, 12 Dec 2015 16:47:13 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBCGlDTS055658; Sat, 12 Dec 2015 16:47:13 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBCGlCkk055652; Sat, 12 Dec 2015 16:47:12 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201512121647.tBCGlCkk055652@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 12 Dec 2015 16:47:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403608 - in head/mail: dovecot2 dovecot2-antispam-plugin dovecot2-pigeonhole dovecot2/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Dec 2015 16:47:14 -0000 Author: adamw Date: Sat Dec 12 16:47:12 2015 New Revision: 403608 URL: https://svnweb.freebsd.org/changeset/ports/403608 Log: 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 Added: head/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh (contents, props changed) Modified: head/mail/dovecot2-antispam-plugin/Makefile head/mail/dovecot2-pigeonhole/Makefile head/mail/dovecot2/Makefile head/mail/dovecot2/distinfo head/mail/dovecot2/files/pkg-message.in Modified: head/mail/dovecot2-antispam-plugin/Makefile ============================================================================== --- head/mail/dovecot2-antispam-plugin/Makefile Sat Dec 12 15:03:06 2015 (r403607) +++ head/mail/dovecot2-antispam-plugin/Makefile Sat Dec 12 16:47:12 2015 (r403608) @@ -3,7 +3,7 @@ PORTNAME= dovecot2-antispam-plugin PORTVERSION= 20130429 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail MASTER_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ LOCAL/olgeni Modified: head/mail/dovecot2-pigeonhole/Makefile ============================================================================== --- head/mail/dovecot2-pigeonhole/Makefile Sat Dec 12 15:03:06 2015 (r403607) +++ head/mail/dovecot2-pigeonhole/Makefile Sat Dec 12 16:47:12 2015 (r403608) @@ -3,7 +3,7 @@ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Sat Dec 12 15:03:06 2015 (r403607) +++ head/mail/dovecot2/Makefile Sat Dec 12 16:47:12 2015 (r403608) @@ -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} Modified: head/mail/dovecot2/distinfo ============================================================================== --- head/mail/dovecot2/distinfo Sat Dec 12 15:03:06 2015 (r403607) +++ head/mail/dovecot2/distinfo Sat Dec 12 16:47:12 2015 (r403608) @@ -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 Added: head/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh Sat Dec 12 16:47:12 2015 (r403608) @@ -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& Modified: head/mail/dovecot2/files/pkg-message.in ============================================================================== --- head/mail/dovecot2/files/pkg-message.in Sat Dec 12 15:03:06 2015 (r403607) +++ head/mail/dovecot2/files/pkg-message.in Sat Dec 12 16:47:12 2015 (r403608) @@ -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. + ---------------------------------------------------------------------