o Re-add CRAMMD5 support (PKGREVISION++).

o PLIST fix (hi xtraeme!).
o Re-add two chunks for dovecot-example.conf that were forgotten.

4 files changed, 35 insertions, 11 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 2bee2210d2e..ad92b3add0e 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2004/05/28 22:20:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/29 15:42:51 cube Exp $
 
 DISTNAME=		dovecot-0.99.10.5
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://dovecot.fi/
 
-.if 0
 PATCH_SITES=		http://www.roughtrade.net/dovecot/
-PATCHFILES=		dovecot-crammd5-0.99.10.2.diff
+PATCHFILES=		dovecot-crammd5-0.99.10.5.diff
 PATCH_DIST_STRIP=	-p1
-.endif
 
 MAINTAINER=		tom@replic8.net
 HOMEPAGE=		http://dovecot.fi/
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index c3d4daf352a..2f79053dd42 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/23 22:07:54 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/05/29 15:42:51 cube Exp $
 libexec/dovecot/dovecot-auth
 libexec/dovecot/imap
 libexec/dovecot/imap-login
@@ -12,8 +12,10 @@ share/doc/dovecot/index.txt
 share/doc/dovecot/mail-storages.txt
 share/doc/dovecot/multiaccess.txt
 share/doc/dovecot/nfs.txt
+share/doc/dovecot/securecoding.txt
 share/examples/dovecot/dovecot-ldap.conf
 share/examples/dovecot/dovecot-openssl.cnf
+share/examples/dovecot/dovecot-mysql.conf
 share/examples/dovecot/dovecot-pgsql.conf
 share/examples/dovecot/dovecot.conf.default
 share/examples/dovecot/mkcert.sh
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 44461d80c41..f46e1a96749 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2004/05/28 22:20:43 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2004/05/29 15:42:51 cube Exp $
 
 SHA1 (dovecot-0.99.10.5.tar.gz) = b9bef7b38e93bdbb0ec168e158b62b436d736589
 Size (dovecot-0.99.10.5.tar.gz) = 863825 bytes
+SHA1 (dovecot-crammd5-0.99.10.5.diff) = b8dfe5007d2bba3d282f3baccabedbb437fbc555
+Size (dovecot-crammd5-0.99.10.5.diff) = 16528 bytes
 SHA1 (patch-aa) = 6ed31ba47883903e5a7b2fcb715432e0c3e8947c
-SHA1 (patch-ab) = 4d8d0c850e20da0b948fdaa7d67a822663e6f0f9
+SHA1 (patch-ab) = c3b4256ba50417e65e6ec69025e7864865c7a1a0
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index cf8da89fdd8..599e5e47e75 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,8 +1,20 @@
-$NetBSD: patch-ab,v 1.4 2004/05/28 22:20:43 xtraeme Exp $
+$NetBSD: patch-ab,v 1.5 2004/05/29 15:42:51 cube Exp $
 
---- dovecot-example.conf.orig	2004-05-29 00:13:10.000000000 +0200
-+++ dovecot-example.conf	2004-05-29 00:15:24.000000000 +0200
-@@ -11,7 +11,7 @@
+--- dovecot-example.conf.orig	2003-12-20 05:14:19.000000000 +0100
++++ dovecot-example.conf
+@@ -1,17 +1,15 @@
+ ## Dovecot 1.0 configuration file
+ 
+ # 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
+-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+-# --with-ssldir=/etc/ssl
++# any of the lines. Exception to this are paths, they're just examples with
++# real defaults being based on configure options.
+ 
+ # Base directory where to store runtime data.
+ #base_dir = /var/run/dovecot/
  
  # Protocols we want to be serving:
  #  imap imaps pop3 pop3s
@@ -38,6 +50,15 @@ $NetBSD: patch-ab,v 1.4 2004/05/28 22:20:43 xtraeme Exp $
  
  ##
  ## Mail processes
+@@ -318,7 +316,7 @@ login = pop3
+ ##
+ 
+ # Executable location
+-#imap_executable = /usr/libexec/dovecot/imap
++imap_executable = @PREFIX@/libexec/dovecot/imap
+ 
+ # 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.
 @@ -326,14 +326,14 @@
  
  # Support for dynamically loadable modules.