Index: head/mail/dovecot2/Makefile =================================================================== --- head/mail/dovecot2/Makefile (revision 403607) +++ head/mail/dovecot2/Makefile (revision 403608) @@ -1,159 +1,161 @@ # Created by: Nagy, Attila # $FreeBSD$ ###################################################################### # Anytime PORTVERSION changes please bump PORTREVISION of # # mail/dovecot2-pigeonhole and also mail/dovecot2-antispam-plugin. # # Please see ports/135311 and ports/146029 for an explanation. # # # # Please be careful when updating this port as changes to this port # # can break mail/dovecot2-pigeonhole. In order to ensure the least # # amount of breakage possible please consult the maintainer of that # # port before updating this one. # ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.2.20 +PORTVERSION= 2.2.21 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ PKGNAMESUFFIX= 2 MAINTAINER= adamw@FreeBSD.org COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual CONFLICTS= dovecot-1.[0-9]* USES= cpe iconv libtool USE_RC_SUBR= dovecot USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow \ --with-docs USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} OPTIONS_DEFINE= KQUEUE LIBWRAP LZ4 SSL VPOPMAIL DOCS EXAMPLES OPTIONS_DEFAULT=KQUEUE SSL GSSAPI_NONE 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 KQUEUE_DESC= kqueue(2) support 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 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 CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:${PORTSDIR}/databases/tinycdb GSSAPI_NONE_CONFIGURE_ON= --without-gssapi GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} ICU_CONFIGURE_WITH= icu ICU_LIB_DEPENDS= libicui18n.so:${PORTSDIR}/devel/icu ICU_USES= pkgconfig KQUEUE_CONFIGURE_OFF= --with-ioloop=poll --with-notify=none KQUEUE_CONFIGURE_ON= --with-ioloop=kqueue --with-notify=kqueue LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap LIBWRAP_CONFIGURE_WITH= libwrap LUCENE_CONFIGURE_WITH= lucene LUCENE_LIB_DEPENDS= libclucene-core.so:${PORTSDIR}/textproc/clucene LZ4_LIB_DEPENDS= liblz4.so:${PORTSDIR}/archivers/liblz4 MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql SOLR_CONFIGURE_WITH= solr SOLR_BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl SOLR_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 SQLITE_USE= SQLITE=3 SQLITE_CONFIGURE_WITH= sqlite SSL_CONFIGURE_WITH= ssl=openssl TEXTCAT_CONFIGURE_WITH= textcat TEXTCAT_LIB_DEPENDS= libtextcat.so:${PORTSDIR}/textproc/libtextcat VPOPMAIL_BUILD_DEPENDS= ${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail VPOPMAIL_CONFIGURE_WITH=vpopmail DOCS= AUTHORS COPYING COPYING.LGPL COPYING.MIT 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 .include 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' \ ${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|${LOCALBASE}|' \ + ${WRKSRC}/src/plugins/fts/decode2text.sh post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR} ${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/mail/dovecot2/distinfo =================================================================== --- head/mail/dovecot2/distinfo (revision 403607) +++ head/mail/dovecot2/distinfo (revision 403608) @@ -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 Index: head/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh =================================================================== --- head/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh (nonexistent) +++ head/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh (revision 403608) @@ -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: head/mail/dovecot2/files/patch-src_plugins_fts_decode2text.sh ___________________________________________________________________ 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/dovecot2/files/pkg-message.in =================================================================== --- head/mail/dovecot2/files/pkg-message.in (revision 403607) +++ head/mail/dovecot2/files/pkg-message.in (revision 403608) @@ -1,17 +1,22 @@ --------------------------------------------------------------------- You must create the configuration files yourself. Copy them over to %%ETCDIR%% and edit them as desired: cp -R %%ETCDIR%%/example-config/* \ %%ETCDIR%% The default configuration includes IMAP and POP3 services, will authenticate users agains the system's passwd file, and will use the default /var/mail/$USER mbox files. Next, enable dovecot in /etc/rc.conf: 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. + --------------------------------------------------------------------- Index: head/mail/dovecot2-antispam-plugin/Makefile =================================================================== --- head/mail/dovecot2-antispam-plugin/Makefile (revision 403607) +++ head/mail/dovecot2-antispam-plugin/Makefile (revision 403608) @@ -1,36 +1,36 @@ # Created by: Denis Shaposhnikov # $FreeBSD$ PORTNAME= dovecot2-antispam-plugin PORTVERSION= 20130429 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail MASTER_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ LOCAL/olgeni DISTNAME= dovecot-antispam-plugin-${DISTVERSION} MAINTAINER= olgeni@FreeBSD.org COMMENT= Dovecot 2.x plugin for spam systems training LICENSE= GPLv2 BUILD_DEPENDS= dovecot2>=2.2.0:${PORTSDIR}/mail/dovecot2 \ gawk:${PORTSDIR}/lang/gawk RUN_DEPENDS= dovecot2>=2.2.0:${PORTSDIR}/mail/dovecot2 CONFLICTS= dovecot-antispam-1.* WRKSRC= ${WRKDIR}/dovecot-antispam-plugin-5ebc6aae4d7c USES= gmake tar:bzip2 USE_AUTOTOOLS= aclocal autoheader autoconf USE_LDCONFIG= ${PREFIX}/lib/dovecot ACLOCAL_ARGS= -I m4 PLIST_FILES= lib/dovecot/lib90_antispam_plugin.so \ man/man7/dovecot-antispam.7.gz post-install: ${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD} .include Index: head/mail/dovecot2-pigeonhole/Makefile =================================================================== --- head/mail/dovecot2-pigeonhole/Makefile (revision 403607) +++ head/mail/dovecot2-pigeonhole/Makefile (revision 403608) @@ -1,41 +1,41 @@ # Created by: Nils Vogels # $FreeBSD$ 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} MAINTAINER= ler@lerctr.org COMMENT= Sieve plugin for the Dovecot 'deliver' LDA and LMTP LICENSE= LGPL21 BUILD_DEPENDS:= dovecot2>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot2 RUN_DEPENDS:= dovecot2>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot2 DOVECOTVERSION= 2.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --without-dovecot-install-dirs \ --docdir=${DOCSDIR} \ --with-dovecot="${LOCALBASE}/lib/dovecot" LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip USES= libtool USE_LDCONFIG= ${PREFIX}/lib/dovecot USE_OPENSSL= yes OPTIONS_DEFINE= DOCS PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/* post-patch: @${REINPLACE_CMD} -E '\ s!^(install-data-am:) install-sieve_docDATA!\1!; \ s!^(uninstall-am:) uninstall-sieve_docDATA!\1!;' \ ${WRKSRC}/doc/Makefile.in .include