2 files changed, 8 insertions, 40 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 8072688ebbdb..db5e27669c8a 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dovecot
 PORTVERSION=	2.2.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2
@@ -27,7 +27,7 @@ CONFLICTS=	dovecot-1.[0-9]*
 # port before updating this one.                                     #
 ######################################################################
 
-USES=		iconv
+USES=		iconv libtool
 USE_RC_SUBR=	dovecot
 
 GNU_CONFIGURE=	yes
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index e292b4bebaa9..ed63c8fd6285 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -424,114 +424,86 @@ include/dovecot/var-expand.h
 include/dovecot/wildcard-match.h
 include/dovecot/write-full.h
 lib/dovecot/auth/libauthdb_imap.a
-lib/dovecot/auth/libauthdb_imap.la
 lib/dovecot/auth/libauthdb_imap.so
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
 lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a
-lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la
 lib/dovecot/doveadm/lib20_doveadm_fts_plugin.so
 lib/dovecot/dovecot-config
 lib/dovecot/lib01_acl_plugin.a
-lib/dovecot/lib01_acl_plugin.la
 lib/dovecot/lib01_acl_plugin.so
 lib/dovecot/lib02_imap_acl_plugin.a
-lib/dovecot/lib02_imap_acl_plugin.la
 lib/dovecot/lib02_imap_acl_plugin.so
 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
 lib/dovecot/lib10_mail_filter_plugin.a
-lib/dovecot/lib10_mail_filter_plugin.la
 lib/dovecot/lib10_mail_filter_plugin.so
 lib/dovecot/lib10_quota_plugin.a
-lib/dovecot/lib10_quota_plugin.la
 lib/dovecot/lib10_quota_plugin.so
 lib/dovecot/lib11_imap_quota_plugin.a
-lib/dovecot/lib11_imap_quota_plugin.la
 lib/dovecot/lib11_imap_quota_plugin.so
 lib/dovecot/lib11_trash_plugin.a
-lib/dovecot/lib11_trash_plugin.la
 lib/dovecot/lib11_trash_plugin.so
 lib/dovecot/lib15_notify_plugin.a
-lib/dovecot/lib15_notify_plugin.la
 lib/dovecot/lib15_notify_plugin.so
 lib/dovecot/lib20_autocreate_plugin.a
-lib/dovecot/lib20_autocreate_plugin.la
 lib/dovecot/lib20_autocreate_plugin.so
 lib/dovecot/lib20_expire_plugin.a
-lib/dovecot/lib20_expire_plugin.la
 lib/dovecot/lib20_expire_plugin.so
 lib/dovecot/lib20_fts_plugin.a
-lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_fts_plugin.so
 lib/dovecot/lib20_listescape_plugin.a
-lib/dovecot/lib20_listescape_plugin.la
 lib/dovecot/lib20_listescape_plugin.so
 lib/dovecot/lib20_mail_log_plugin.a
-lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mail_log_plugin.so
 lib/dovecot/lib20_mailbox_alias_plugin.a
-lib/dovecot/lib20_mailbox_alias_plugin.la
 lib/dovecot/lib20_mailbox_alias_plugin.so
 lib/dovecot/lib20_replication_plugin.a
-lib/dovecot/lib20_replication_plugin.la
 lib/dovecot/lib20_replication_plugin.so
 lib/dovecot/lib20_virtual_plugin.a
-lib/dovecot/lib20_virtual_plugin.la
 lib/dovecot/lib20_virtual_plugin.so
 lib/dovecot/lib20_zlib_plugin.a
-lib/dovecot/lib20_zlib_plugin.la
 lib/dovecot/lib20_zlib_plugin.so
 lib/dovecot/lib21_fts_squat_plugin.a
-lib/dovecot/lib21_fts_squat_plugin.la
 lib/dovecot/lib21_fts_squat_plugin.so
 lib/dovecot/lib30_imap_zlib_plugin.a
-lib/dovecot/lib30_imap_zlib_plugin.la
 lib/dovecot/lib30_imap_zlib_plugin.so
 lib/dovecot/lib90_stats_plugin.a
-lib/dovecot/lib90_stats_plugin.la
 lib/dovecot/lib90_stats_plugin.so
 lib/dovecot/lib95_imap_stats_plugin.a
-lib/dovecot/lib95_imap_stats_plugin.la
 lib/dovecot/lib95_imap_stats_plugin.so
 lib/dovecot/libdovecot-compression.a
-lib/dovecot/libdovecot-compression.la
 lib/dovecot/libdovecot-compression.so
 lib/dovecot/libdovecot-compression.so.0
+lib/dovecot/libdovecot-compression.so.0.0.0
 lib/dovecot/libdovecot-lda.a
-lib/dovecot/libdovecot-lda.la
 lib/dovecot/libdovecot-lda.so
 lib/dovecot/libdovecot-lda.so.0
+lib/dovecot/libdovecot-lda.so.0.0.0
 lib/dovecot/libdovecot-login.a
-lib/dovecot/libdovecot-login.la
 lib/dovecot/libdovecot-login.so
 lib/dovecot/libdovecot-login.so.0
+lib/dovecot/libdovecot-login.so.0.0.0
 lib/dovecot/libdovecot-sql.a
-lib/dovecot/libdovecot-sql.la
 lib/dovecot/libdovecot-sql.so
 lib/dovecot/libdovecot-sql.so.0
+lib/dovecot/libdovecot-sql.so.0.0.0
 lib/dovecot/libdovecot-storage.a
-lib/dovecot/libdovecot-storage.la
 lib/dovecot/libdovecot-storage.so
 lib/dovecot/libdovecot-storage.so.0
+lib/dovecot/libdovecot-storage.so.0.0.0
 lib/dovecot/libdovecot.a
-lib/dovecot/libdovecot.la
 lib/dovecot/libdovecot.so
 lib/dovecot/libdovecot.so.0
+lib/dovecot/libdovecot.so.0.0.0
 libexec/dovecot/aggregator
 libexec/dovecot/anvil
 libexec/dovecot/auth
@@ -615,15 +587,11 @@ share/aclocal/dovecot.m4
 %%PORTDOCS%%@dirrmtry %%ETCDIR%%
 %%LIBWRAP%%libexec/dovecot/tcpwrap
 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a
-%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.la
 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so
 %%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a
-%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.la
 %%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.so
 %%SOLR%%lib/dovecot/lib21_fts_solr_plugin.a
-%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.la
 %%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so
 %%SSL%%lib/dovecot/libssl_iostream_openssl.a
-%%SSL%%lib/dovecot/libssl_iostream_openssl.la
 %%SSL%%lib/dovecot/libssl_iostream_openssl.so
 @unexec echo "If you are removing dovecot2 permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."