5 files changed, 112 insertions, 49 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 4b4ad5aa48a5..016937ea9543 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	dovecot
-DISTVERSION=	1.0.14
+DISTVERSION=	1.1.1
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.dovecot.org/releases/1.0/
+MASTER_SITES=	http://www.dovecot.org/releases/1.1/
 
 MAINTAINER=	robin@isometry.net
 COMMENT=	Secure and compact IMAP and POP3 servers
@@ -17,8 +17,6 @@ COMMENT=	Secure and compact IMAP and POP3 servers
 USE_ICONV=	yes
 USE_RC_SUBR=	dovecot.sh
 
-CONFLICTS?=	${PORTNAME}-1.[1-9].*
-
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-shadow --localstatedir=/var
@@ -54,6 +52,9 @@ OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
 
 .include <bsd.port.pre.mk>
 
+# Default requirement for dovecot rc script
+_REQUIRE=	LOGIN
+
 ## kqueue(2) support
 #
 .if !defined(WITHOUT_KQUEUE)
@@ -115,6 +116,9 @@ CONFIGURE_ARGS+=	--without-vpopmail
 .if defined(WITH_LDAP)
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
+_REQUIRE+=		slapd
+.else
+CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 ## PostgreSQL Support
@@ -122,6 +126,9 @@ CONFIGURE_ARGS+=	--with-ldap
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-pgsql
+_REQUIRE+=		postgresql
+.else
+CONFIGURE_ARGS+=	--without-pgsql
 .endif
 
 ## MySQL Support
@@ -129,6 +136,9 @@ CONFIGURE_ARGS+=	--with-pgsql
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
+_REQUIRE+=		mysql
+.else
+CONFIGURE_ARGS+=	--without-mysql
 .endif
 
 ## SQLite Support
@@ -136,8 +146,12 @@ CONFIGURE_ARGS+=	--with-mysql
 .if defined(WITH_SQLITE)
 USE_SQLITE=		3
 CONFIGURE_ARGS+=	--with-sqlite
+.else
+CONFIGURE_ARGS+=	--without-sqlite
 .endif
 
+SUB_LIST+=		REQUIRE="${_REQUIRE}"
+
 post-patch:
 .if defined(WITH_GSSAPI)
 	@${REINPLACE_CMD} -e 's,<gssapi/gssapi\.h>,<gssapi.h>,' \
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 5ac370b6bf7a..b347657a8305 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-MD5 (dovecot-1.0.14.tar.gz) = 89e295832dd5c4ba93d68454e74d7ae3
-SHA256 (dovecot-1.0.14.tar.gz) = 94d5534d7d938268b1e4251617fb75be6884d64557b73673fc7d1809514dadc5
-SIZE (dovecot-1.0.14.tar.gz) = 1781681
+MD5 (dovecot-1.1.1.tar.gz) = 239072365e4fc35b8a7162f841cb07c9
+SHA256 (dovecot-1.1.1.tar.gz) = 936982d0259035b380315599668d37276cfa5dd26f889126f50ccc03fecf9f5e
+SIZE (dovecot-1.1.1.tar.gz) = 2273779
diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.sh.in
index 4d6d3ecc21a8..8d125d59a17c 100644
--- a/mail/dovecot/files/dovecot.sh.in
+++ b/mail/dovecot/files/dovecot.sh.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: dovecot
-# REQUIRE: LOGIN
+# REQUIRE: %%REQUIRE%%
 # KEYWORD: shutdown
 
 #
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index b534647dd4a4..cd57d29ee03d 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,5 +1,5 @@
---- dovecot-example.conf.orig	2008-03-04 05:48:12.000000000 +0000
-+++ dovecot-example.conf	2008-03-05 22:49:08.554336095 +0000
+--- dovecot-example.conf.orig	2008-06-21 21:21:38.422213158 +0100
++++ dovecot-example.conf	2008-06-21 21:29:47.638914442 +0100
 @@ -12,7 +12,7 @@
  # Default values are shown for each setting, it's not required to uncomment
  # any of the lines. Exception to this are paths, they're just examples with
@@ -15,9 +15,9 @@
  #protocols = imap imaps
 +protocols = %%PROTOCOLS%%
  
- # IP or host address where to listen in for connections. It's not currently
- # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -210,6 +212,7 @@
+ # A space separated list of IP or host addresses where to listen in for
+ # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
+@@ -213,6 +214,7 @@
  # <doc/wiki/MailLocation.txt>
  #
  #mail_location = 
@@ -25,15 +25,15 @@
  
  # If you need to set multiple mailbox locations or want to change default
  # namespace settings, you can do it by defining namespace sections.
-@@ -256,6 +259,7 @@
- # used only for creating mbox dotlock files when creation fails for INBOX.
+@@ -273,6 +275,7 @@
+ # used only with INBOX when either its initial creation or dotlocking fails.
  # Typically this is set to "mail" to give access to /var/mail.
  #mail_privileged_group =
 +mail_privileged_group = mail
  
  # Grant access to these supplementary groups for mail processes. Typically
  # these are used to set up access to shared mailboxes. Note that it may be
-@@ -320,6 +324,7 @@
+@@ -340,6 +343,7 @@
  # IP address. Useful for seeing who are actually using the IMAP processes
  # (eg. shared mailboxes or if same uid is used for multiple accounts).
  #verbose_proctitle = no
@@ -41,7 +41,7 @@
  
  # Valid UID range for users, defaults to 500 and above. This is mostly
  # to make sure that users can't log in as daemons or other system users.
-@@ -333,6 +338,7 @@
+@@ -353,6 +357,7 @@
  # belongs to supplementary groups with non-valid GIDs, those groups are
  # not set.
  #first_valid_gid = 1
@@ -49,7 +49,7 @@
  #last_valid_gid = 0
  
  # Maximum number of running mail processes. When this limit is reached,
-@@ -506,19 +512,19 @@
+@@ -503,19 +508,19 @@
  
  protocol imap {
    # Login executable location.
@@ -73,7 +73,7 @@
  
    # Maximum IMAP command line length in bytes. Some clients generate very long
    # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -528,7 +534,7 @@
+@@ -529,7 +534,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -82,15 +82,15 @@
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -563,6 +569,7 @@
+@@ -564,6 +569,7 @@
    #     accept '/' suffix in mailbox names in subscriptions list.
    # The list is space-separated.
-   #imap_client_workarounds = outlook-idle
-+  imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
+   #imap_client_workarounds = 
++  imap_client_workarounds = delay-newmail netscape-eoh tb-extra-mailbox-sep
  }
    
  ##
-@@ -571,11 +578,11 @@
+@@ -572,11 +578,11 @@
  
  protocol pop3 {
    # Login executable location.
@@ -104,15 +104,7 @@
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -621,6 +628,7 @@
-   # installations.
-   #
-   #pop3_uidl_format = 
-+  pop3_uidl_format = %08Xu%08Xv
- 
-   # POP3 logout format string:
-   #  %t - number of TOP commands
-@@ -635,7 +643,7 @@
+@@ -636,7 +642,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -121,7 +113,7 @@
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -646,6 +654,7 @@
+@@ -647,6 +653,7 @@
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
    #pop3_client_workarounds = 
@@ -129,20 +121,24 @@
  }
  
  ##
-@@ -663,10 +672,11 @@
+@@ -664,7 +671,7 @@
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
 -  #mail_plugin_dir = /usr/lib/dovecot/lda
 +  #mail_plugin_dir = %%PREFIX%%/lib/dovecot/lda
  
+   # If user is over quota, return with temporary failure instead of
+   # bouncing the mail.
+@@ -679,6 +686,7 @@
+ 
    # Binary to use for sending mails.
    #sendmail_path = /usr/lib/sendmail
 +  sendmail_path = /usr/sbin/sendmail
  
-   # UNIX socket path to master authentication server to find users.
-   #auth_socket_path = /var/run/dovecot/auth-master
-@@ -677,7 +687,7 @@
+   # Human readable error message for rejection mails. Use can use variables:
+   #  %n = CRLF, %r = reason, %s = subject, %t = recipient
+@@ -693,7 +701,7 @@
  ##
  
  # Executable location
@@ -151,7 +147,16 @@
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -783,7 +793,7 @@
+@@ -783,7 +791,7 @@
+ #auth_ntlm_use_winbind = no
+ 
+ # Path for Samba's ntlm_auth helper binary.
+-#auth_winbind_helper_path = /usr/bin/ntlm_auth
++#auth_winbind_helper_path = %%PREFIX%%/bin/ntlm_auth
+ 
+ # Number of seconds to delay before replying to failed authentications.
+ #auth_failure_delay = 2
+@@ -816,7 +824,7 @@
  
    #passdb passwd-file {
      # File contains a list of usernames, one per line
@@ -160,7 +165,7 @@
      #deny = yes
    #}
  
-@@ -1021,7 +1031,7 @@
+@@ -1053,7 +1061,7 @@
  # referenced using URIs in format "proxy:<name>".
  
  dict {
@@ -168,22 +173,41 @@
 +  #quota = mysql:%%PREFIX%%/etc/dovecot-dict-quota.conf 
  }
  
- ##
-@@ -1045,7 +1055,7 @@
-   # directory. You can also optionally give a global ACL directory path where
-   # ACLs are applied to all users' mailboxes. The global ACL directory contains
-   # one file for each mailbox, eg. INBOX or sub.mailbox.
--  #acl = vfile:/etc/dovecot-acls
-+  #acl = vfile:%%PREFIX%%/etc/dovecot-acls
+ # Path to Berkeley DB's configuration file. See doc/dovecot-db.conf for an
+@@ -1095,8 +1103,8 @@
+   # Each quota root has separate limits. Only the command for the first
+   # exceeded limit is excecuted, so put the highest limit first.
+   # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
+-  #   quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
+-  #   quota_warning2 = storage=80%% /usr/local/bin/quota-warning.sh 80
++  #   quota_warning = storage=95%% %%PREFIX%%/local/bin/quota-warning.sh 95
++  #   quota_warning2 = storage=80%% %%PREFIX%%/local/bin/quota-warning.sh 80
+   #quota = maildir
+ 
+   # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir
+@@ -1105,7 +1113,7 @@
+   # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter
+   # specifies how many seconds to wait between stat()ing dovecot-acl file
+   # to see if it changed.
+-  #acl = vfile:/etc/dovecot-acls:cache_secs=300
++  #acl = vfile:%%PREFIX%%/etc/dovecot-acls:cache_secs=300
  
    # Convert plugin. If set, specifies the source storage path which is
    # converted to destination storage (mail_location) when the user logs in.
-@@ -1059,7 +1069,7 @@
+@@ -1124,14 +1132,14 @@
    # until the message can be saved within quota limits. The configuration file
    # is a text file where each line is in format: <priority> <mailbox name>
    # Mails are first deleted in lowest -> highest priority number order
 -  #trash = /etc/dovecot-trash.conf
 +  #trash = %%PREFIX%%/etc/dovecot-trash.conf
  
-   # Lazy expunge plugin. Currently works only with maildirs. When a user
-   # expunges mails, the mails are moved to a mailbox in another namespace
+   # Expire plugin. Mails are expunged from mailboxes after being there the
+   # configurable time. The first expiration date for each mailbox is stored in
+   # a dictionary so it can be quickly determined which mailboxes contain
+   # expired mails. The actual expunging is done in a nightly cronjob, which
+   # you must set up:
+-  #   dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool
++  #   dovecot --exec-mail ext %%PREFIX%%/libexec/dovecot/expire-tool
+   #expire = Trash 7 Spam 30
+   #expire_dict = db:/var/lib/dovecot/expire.db
+ 
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index 849943c7f720..1e80a99473da 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -13,22 +13,32 @@ lib/dovecot/imap/lib11_imap_quota_plugin.la
 lib/dovecot/imap/lib11_imap_quota_plugin.so
 lib/dovecot/imap/lib11_trash_plugin.so
 lib/dovecot/imap/lib20_convert_plugin.so
+lib/dovecot/imap/lib20_expire_plugin.so
+lib/dovecot/imap/lib20_fts_plugin.so
 lib/dovecot/imap/lib20_mail_log_plugin.so
+lib/dovecot/imap/lib20_mbox_snarf_plugin.so
 lib/dovecot/imap/lib20_zlib_plugin.a
 lib/dovecot/imap/lib20_zlib_plugin.la
 lib/dovecot/imap/lib20_zlib_plugin.so
+lib/dovecot/imap/lib21_fts_squat_plugin.so
 @dirrm lib/dovecot/imap
 lib/dovecot/lda/lib01_acl_plugin.so
 lib/dovecot/lda/lib10_quota_plugin.so
 lib/dovecot/lda/lib11_trash_plugin.so
 lib/dovecot/lda/lib20_convert_plugin.so
+lib/dovecot/lda/lib20_expire_plugin.so
+lib/dovecot/lda/lib20_fts_plugin.so
 lib/dovecot/lda/lib20_mail_log_plugin.so
+lib/dovecot/lda/lib21_fts_squat_plugin.so
 @dirrm lib/dovecot/lda
 lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
 lib/dovecot/pop3/lib10_quota_plugin.so
 lib/dovecot/pop3/lib20_convert_plugin.so
+lib/dovecot/pop3/lib20_expire_plugin.so
 lib/dovecot/pop3/lib20_mail_log_plugin.so
+lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
 @dirrm lib/dovecot/pop3
+@dirrm lib/dovecot/auth
 lib/dovecot/lib01_acl_plugin.a
 lib/dovecot/lib01_acl_plugin.la
 lib/dovecot/lib01_acl_plugin.so
@@ -44,18 +54,33 @@ lib/dovecot/lib11_trash_plugin.so
 lib/dovecot/lib20_convert_plugin.a
 lib/dovecot/lib20_convert_plugin.la
 lib/dovecot/lib20_convert_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_mail_log_plugin.a
 lib/dovecot/lib20_mail_log_plugin.la
 lib/dovecot/lib20_mail_log_plugin.so
+lib/dovecot/lib20_mbox_snarf_plugin.a
+lib/dovecot/lib20_mbox_snarf_plugin.la
+lib/dovecot/lib20_mbox_snarf_plugin.so
+lib/dovecot/lib21_fts_squat_plugin.a
+lib/dovecot/lib21_fts_squat_plugin.la
+lib/dovecot/lib21_fts_squat_plugin.so
 @dirrm lib/dovecot
 libexec/dovecot/checkpassword-reply
+libexec/dovecot/convert-tool
 %%LDA%%libexec/dovecot/deliver
 libexec/dovecot/dict
 libexec/dovecot/dovecot-auth
+libexec/dovecot/expire-tool
 libexec/dovecot/gdbhelper
 libexec/dovecot/idxview
 libexec/dovecot/imap
 libexec/dovecot/imap-login
+libexec/dovecot/listview
 libexec/dovecot/logview
 %%POP3%%libexec/dovecot/pop3
 %%POP3%%libexec/dovecot/pop3-login