Upgrade to version 1.0.beta7 and disable broken KQUEUE support.

Obtained from:	maintainer (Robin Breathe <robin(at)isometry.net>)

4 files changed, 36 insertions, 32 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index d90e32b66c18..3b13bba8d12b 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	dovecot
-DISTVERSION=	1.0.beta3
-PORTREVISION=	1
+DISTVERSION=	1.0.beta7
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/
 
@@ -35,7 +34,7 @@ PORTDOCS=	USE-WIKI-INSTEAD \
 CONFIGURE_ARGS+=	--without-docs
 .endif
 
-OPTIONS=	KQUEUE		"kqueue(2) support"	on  \
+OPTIONS=	KQUEUE		"kqueue(2) support"	off  \
 		SASL2		"SASL2 support"		off \
 		GSSAPI		"GSSAPI support"	off \
 		VPOPMAIL	"VPopMail support"	off \
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 1338f2df8130..64adb71933c0 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-MD5 (dovecot-1.0.beta3.tar.gz) = 5418f9f7fe99e4f10bb82d9fe504138a
-SHA256 (dovecot-1.0.beta3.tar.gz) = c283111cd57c7938356c3f564eec6a8e4ba066f5c448f209e305a1409232520e
-SIZE (dovecot-1.0.beta3.tar.gz) = 1360574
+MD5 (dovecot-1.0.beta7.tar.gz) = bfbc4c3705f6e6e891934168cd26e9dd
+SHA256 (dovecot-1.0.beta7.tar.gz) = 0044595968396d094d6e67e9112b3af16bef1bd1d63ec4934cc9ca889864e580
+SIZE (dovecot-1.0.beta7.tar.gz) = 1406322
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index db540085bb01..2ef8f943ca78 100644
--- a/mail/dovecot/files/patch-dovecot-example.conf
+++ b/mail/dovecot/files/patch-dovecot-example.conf
@@ -1,6 +1,6 @@
---- dovecot-example.conf.orig	Fri Feb 10 18:46:38 2006
-+++ dovecot-example.conf	Fri Feb 10 18:51:23 2006
-@@ -7,7 +7,7 @@
+--- dovecot-example.conf.orig	Wed Apr 12 11:37:30 2006
++++ dovecot-example.conf	Fri Apr 28 23:23:22 2006
+@@ -9,7 +9,7 @@
  # Default values are shown after each value, it's not required to uncomment
  # any of the lines. Exception to this are paths, they're just examples
  # with real defaults being based on configure options. The paths listed here
@@ -9,7 +9,7 @@
  # --with-ssldir=/etc/ssl
  
  # Base directory where to store runtime data.
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,7 @@
  
  # Protocols we want to be serving:
  #  imap imaps pop3 pop3s
@@ -18,7 +18,7 @@
  
  # IP or host address where to listen in for connections. It's not currently
  # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -104,7 +104,7 @@
+@@ -124,7 +124,7 @@
  
  # Set max. process size in megabytes. If you don't use
  # login_process_per_connection you might need to grow this.
@@ -27,7 +27,7 @@
  
  # Should each login be processed in it's own process (yes), or should one
  # login process be allowed to process multiple connections (no)? Yes is more
-@@ -153,7 +153,7 @@
+@@ -173,7 +173,7 @@
  # Show more verbose process titles (in ps). Currently shows user name and
  # IP address. Useful for seeing who are actually using the IMAP processes
  # (eg. shared mailboxes or if same uid is used for multiple accounts).
@@ -36,7 +36,7 @@
  
  # Show protocol level SSL errors.
  #verbose_ssl = no
-@@ -169,12 +169,12 @@
+@@ -189,12 +189,12 @@
  # non-valid GID as primary group ID aren't allowed to log in. If user
  # belongs to supplementary groups with non-valid GIDs, those groups are
  # not set.
@@ -51,7 +51,7 @@
  
  # ':' separated list of directories under which chrooting is allowed for mail
  # processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
-@@ -210,7 +210,7 @@
+@@ -230,7 +230,7 @@
  #   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
  #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
@@ -60,7 +60,7 @@
  
  # If you need to set multiple mailbox locations or want to change default
  # namespace settings, you can do it by defining namespace sections:
-@@ -420,19 +420,19 @@
+@@ -439,19 +439,19 @@
  
  protocol imap {
    # Login executable location.
@@ -84,16 +84,16 @@
  
    # 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
-@@ -441,7 +441,7 @@
- 
-   # Support for dynamically loadable modules.
-   #mail_use_modules = no
--  #mail_modules = /usr/lib/dovecot/imap
-+  #mail_modules = %%PREFIX%%/lib/dovecot/imap
+@@ -461,7 +461,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/imap
++  #mail_plugin_dir = %%PREFIX%%/lib/dovecot/imap
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -472,7 +472,7 @@
+@@ -492,7 +492,7 @@
    #     but not both. Thunderbird separates these two by forcing server to
    #     accept '/' suffix in mailbox names in subscriptions list.
    # The list is space-separated.
@@ -102,7 +102,7 @@
  }
    
  ##
-@@ -481,10 +481,10 @@
+@@ -501,10 +501,10 @@
  
  protocol pop3 {
    # Login executable location.
@@ -115,7 +115,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
-@@ -521,7 +521,7 @@
+@@ -547,7 +547,7 @@
    # installations. %08Xu%08Xv will be the new default, so use it for new
    # installations.
    #
@@ -124,16 +124,16 @@
  
    # POP3 logout format string:
    #  %t - number of TOP commands
-@@ -535,7 +535,7 @@
- 
-   # Support for dynamically loadable modules.
-   #mail_use_modules = no
--  #mail_modules = /usr/lib/dovecot/pop3
-+  #mail_modules = %%PREFIX%%/lib/dovecot/pop3
+@@ -562,7 +562,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/pop3
++  #mail_plugin_dir = %%PREFIX%%/lib/dovecot/pop3
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -545,7 +545,7 @@
+@@ -572,7 +572,7 @@
    #     Outlook Express and Netscape Mail breaks if end of headers-line is
    #     missing. This option simply sends it if it's missing.
    # The list is space-separated.
@@ -142,7 +142,7 @@
  }
  
  ##
-@@ -553,7 +553,7 @@
+@@ -580,7 +580,7 @@
  ##
  
  # Executable location
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index dcb0d6e7dd67..e6f9fa5b98bd 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 etc/dovecot-example.conf
+lib/dovecot/imap/lib01_acl_plugin.so
 lib/dovecot/imap/lib01_convert_plugin.so
 lib/dovecot/imap/lib01_quota_plugin.so
 lib/dovecot/imap/lib01_zlib_plugin.a
@@ -12,10 +13,14 @@ lib/dovecot/imap/lib02_trash_plugin.so
 @dirrm lib/dovecot/imap
 lib/dovecot/pop3/lib01_convert_plugin.so
 @dirrm lib/dovecot/pop3
+lib/dovecot/lda/lib01_acl_plugin.so
 lib/dovecot/lda/lib01_convert_plugin.so
 lib/dovecot/lda/lib01_quota_plugin.so
 lib/dovecot/lda/lib02_trash_plugin.so
 @dirrm lib/dovecot/lda
+lib/dovecot/lib01_acl_plugin.a
+lib/dovecot/lib01_acl_plugin.la
+lib/dovecot/lib01_acl_plugin.so
 lib/dovecot/lib01_convert_plugin.a
 lib/dovecot/lib01_convert_plugin.la
 lib/dovecot/lib01_convert_plugin.so