Date: Fri, 11 May 2012 08:45:02 +0200 From: Attila Nagy <bra@fsn.hu> To: zi@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/167718: mail/dovecot2 upgraded to 2.1.6 Message-ID: <4FACB56E.5020704@fsn.hu> In-Reply-To: <201205091647.q49GlNvh066152@freefall.freebsd.org> References: <201205091647.q49GlNvh066152@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------040908040709020508000306 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, Attached is the patch for 2.1.6 upgrade, which also includes the option to build the port with Apache Solr support and the required pigeonhole portrevision bump. On 05/09/12 18:47, zi@FreeBSD.org wrote: > Synopsis: mail/dovecot2 upgraded to 2.1.6 > > Responsible-Changed-From-To: freebsd-ports-bugs->zi > Responsible-Changed-By: zi > Responsible-Changed-When: Wed May 9 16:47:23 UTC 2012 > Responsible-Changed-Why: > I'll take it. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=167718 --------------040908040709020508000306 Content-Type: text/plain; name="dc2.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="dc2.txt" diff -ruN dovecot2.orig/Makefile dovecot2/Makefile --- dovecot2.orig/Makefile 2012-04-08 18:55:13.000000000 +0200 +++ dovecot2/Makefile 2012-05-09 15:58:40.197839683 +0200 @@ -6,7 +6,7 @@ # PORTNAME= dovecot -PORTVERSION= 2.1.3 +PORTVERSION= 2.1.6 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ @@ -63,7 +63,8 @@ LDAP "OpenLDAP support" off \ PGSQL "PostgreSQL support" off \ MYSQL "MySQL support" off \ - SQLITE "SQLite support" off + SQLITE "SQLite support" off \ + SOLR "Solr support" off .include <bsd.port.pre.mk> @@ -157,6 +158,20 @@ PLIST_SUB+= SQL="@comment " .endif +## SOLR support +# +.if defined(WITH_SOLR) && !defined(WITHOUT_SOLR) +USE_SOLR= yes +CONFIGURE_ARGS+=--with-solr +LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 +PLIST_SUB+= WITHSOLR="" +SUB_LIST+= WITHSOLR="" +.else +CONFIGURE_ARGS+=--without-solr +PLIST_SUB+= WITHSOLR="@comment " +SUB_LIST+= WITHSOLR="@comment " +.endif + SUB_LIST= REQUIRE="${_REQUIRE}" SUB_FILES= pkg-deinstall pkg-message diff -ruN dovecot2.orig/distinfo dovecot2/distinfo --- dovecot2.orig/distinfo 2012-04-08 18:55:13.000000000 +0200 +++ dovecot2/distinfo 2012-05-09 15:30:52.847832085 +0200 @@ -1,2 +1,2 @@ -SHA256 (dovecot-2.1.3.tar.gz) = a0becf924b967ade8f319519e3ea0ae527ef749b319a5996407829fd79d56a24 -SIZE (dovecot-2.1.3.tar.gz) = 3724550 +SHA256 (dovecot-2.1.6.tar.gz) = 4b81b2cdf624344c6c2ff91be1b794911b51c98dffa24095a6dcbc7eb6bc1e89 +SIZE (dovecot-2.1.6.tar.gz) = 3773967 diff -ruN dovecot2.orig/pkg-plist dovecot2/pkg-plist --- dovecot2.orig/pkg-plist 2012-04-08 18:55:13.000000000 +0200 +++ dovecot2/pkg-plist 2012-05-09 16:00:12.477852785 +0200 @@ -379,6 +379,9 @@ lib/dovecot/lib02_lazy_expunge_plugin.a lib/dovecot/lib02_lazy_expunge_plugin.la lib/dovecot/lib02_lazy_expunge_plugin.so +lib/dovecot/lib05_pop3_migration_plugin.a +lib/dovecot/lib05_pop3_migration_plugin.la +lib/dovecot/lib05_pop3_migration_plugin.so lib/dovecot/lib05_snarf_plugin.a lib/dovecot/lib05_snarf_plugin.la lib/dovecot/lib05_snarf_plugin.so @@ -421,6 +424,9 @@ lib/dovecot/lib21_fts_squat_plugin.a lib/dovecot/lib21_fts_squat_plugin.la lib/dovecot/lib21_fts_squat_plugin.so +%%WITHSOLR%%lib/dovecot/lib21_fts_solr_plugin.a +%%WITHSOLR%%lib/dovecot/lib21_fts_solr_plugin.la +%%WITHSOLR%%lib/dovecot/lib21_fts_solr_plugin.so lib/dovecot/lib30_imap_zlib_plugin.a lib/dovecot/lib30_imap_zlib_plugin.la lib/dovecot/lib30_imap_zlib_plugin.so diff -ruN dovecot2-pigeonhole.orig/Makefile dovecot2-pigeonhole/Makefile --- dovecot2-pigeonhole.orig/Makefile 2012-04-09 09:29:29.243422000 +0200 +++ dovecot2-pigeonhole/Makefile 2012-05-09 15:45:08.297844978 +0200 @@ -7,6 +7,7 @@ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} --------------040908040709020508000306--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4FACB56E.5020704>