3 files changed, 21 insertions, 21 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index fd01ea7a865f..d4f380244d92 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,15 +7,13 @@
 #
 
 PORTNAME=	dovecot
-DISTVERSION=	0.99.12.1
+DISTVERSION=	0.99.13
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/
 
 MAINTAINER=	robin@isometry.net
 COMMENT=	Secure and compact IMAP and POP3 servers
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.99.12
-
 CONFLICTS=	dovecot-1.*
 
 USE_ICONV=	yes
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index b0e008921dda..c844b1aa7a9f 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,2 +1,2 @@
-MD5 (dovecot-0.99.12.1.tar.gz) = 08c3952cf6cc0d87e0239cccd9faf4b5
-SIZE (dovecot-0.99.12.1.tar.gz) = 864722
+MD5 (dovecot-0.99.13.tar.gz) = a84896c4236232b843972370e3730729
+SIZE (dovecot-0.99.13.tar.gz) = 867787
diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf
index 94d8c9b423c7..ceb2dfe706af 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	Fri Sep 10 17:27:41 2004
-+++ dovecot-example.conf	Fri Sep 10 17:31:39 2004
+--- dovecot-example.conf.orig	Tue Jan 11 00:49:06 2005
++++ dovecot-example.conf	Tue Jan 11 00:53:50 2005
 @@ -3,7 +3,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
@@ -36,7 +36,7 @@
  
  # SSL parameter file. Master process generates this file for login processes.
  # It contains Diffie Hellman and RSA parameters.
-@@ -84,12 +84,12 @@
+@@ -85,14 +85,14 @@
  login = imap
  
  # Executable location.
@@ -46,12 +46,14 @@
  # User to use for the login process. Create a completely new user for this,
  # and don't use it anywhere else. The user must also belong to a group where
  # only it has access, it's used to control access for authentication process.
+ # Note that this user is NOT used to access mails.
+ # http://wiki.dovecot.org/UserIds
 -#login_user = dovecot
 +login_user = dovecot
  
  # Set max. process size in megabytes. If you don't use
  # login_process_per_connection you might need to grow this.
-@@ -129,7 +129,7 @@
+@@ -132,7 +132,7 @@
  login = pop3
  
  # Exception to above rule being the executable location.
@@ -60,7 +62,7 @@
  
  ##
  ## Mail processes
-@@ -142,7 +142,7 @@
+@@ -145,7 +145,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).
@@ -69,7 +71,7 @@
  
  # Show protocol level SSL errors.
  #verbose_ssl = no
-@@ -158,7 +158,7 @@
+@@ -161,7 +161,7 @@
  # 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.
@@ -78,7 +80,7 @@
  #last_valid_gid = 0
  
  # Grant access to these extra groups for mail processes. Typical use would be
-@@ -171,7 +171,7 @@
+@@ -174,7 +174,7 @@
  # WARNING: Never add directories here which local users can modify, that
  # may lead to root exploit. Usually this should be done only if you don't
  # allow shell access for users. See doc/configuration.txt for more information.
@@ -87,7 +89,7 @@
  
  # Default chroot directory for mail processes. This can be overridden by
  # giving /./ in user's home directory (eg. /home/./user chroots into /home).
-@@ -194,7 +194,7 @@
+@@ -197,7 +197,7 @@
  #   default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u
  #   default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
  #
@@ -96,7 +98,7 @@
  
  # Space-separated list of fields to cache for all mails. Currently these
  # fields are allowed followed by a list of commands they speed up:
-@@ -242,7 +242,7 @@
+@@ -245,7 +245,7 @@
  #   outlook-pop3-no-nuls:
  #     Outlook and Outlook Express hang if mails contain NUL characters.
  #     This setting replaces them with 0x80 character.
@@ -105,7 +107,7 @@
  
  # Dovecot can notify client of new mail in selected mailbox soon after it's
  # received. This setting specifies the minimum interval in seconds between
-@@ -286,7 +286,7 @@
+@@ -289,7 +289,7 @@
  # know any MUA which would modify mail files directly. IMAP protocol also
  # requires that the mails don't change, so it would be problematic in any case.
  # If you care about performance, enable it.
@@ -114,7 +116,7 @@
  
  # Check if mails' content has been changed by external programs. This slows
  # down things as extra stat() needs to be called for each file. If changes are
-@@ -335,7 +335,7 @@
+@@ -338,7 +338,7 @@
  ##
  
  # Executable location
@@ -123,7 +125,7 @@
  
  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
  # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -343,14 +343,14 @@
+@@ -346,14 +346,14 @@
  
  # Support for dynamically loadable modules.
  #imap_use_modules = no
@@ -140,7 +142,7 @@
  
  # Set max. process size in megabytes. Most of the memory goes to mmap()ing
  # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -358,7 +358,7 @@
+@@ -361,7 +361,7 @@
  
  # Support for dynamically loadable modules.
  #pop3_use_modules = no
@@ -149,11 +151,11 @@
  
  ##
  ## Authentication processes
-@@ -431,9 +431,9 @@
+@@ -438,9 +438,9 @@
  #   vpopmail: vpopmail authentication
  #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
  #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
--auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf
+-auth_passdb = pam
 +auth_passdb = passwd
  
 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
@@ -161,7 +163,7 @@
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -464,7 +464,7 @@
+@@ -472,7 +472,7 @@
  
  # More verbose logging. Useful for figuring out why authentication isn't
  # working.