4 files changed, 104 insertions, 47 deletions

diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index 48acc164e509..ca647420e3ea 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -6,19 +6,45 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	0.99.5
+PORTVERSION=	0.99.8
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://dovecot.procontrol.fi/
+MASTER_SITES=	http://dovecot.procontrol.fi/test/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-test5
 
 MAINTAINER=	d.marks@student.umist.ac.uk
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-shadow --enable-ipv6 \
+CONFIGURE_ARGS+=	--without-shadow --enable-ipv6 \
 		--localstatedir=/var/dovecot --with-ssl=openssl \
-		--with-vpopmail --with-pam --with-rawlog \
-		--with-ssldir=/var/dovecot/ssl 
-		
+		--with-ssldir=/var/dovecot/ssl --with-pop3d \
+		--with-ldap --with-pam
+
+#
+# SASL2 support
+#
+# SASL provides authentication support to
+# session-based protocols. This is can be
+# used by dovecot for authentication sources.
+#
+.if WITH_SASL2
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+CONFIGURE_ARGS+=	--with-cyrus-sasl2
+.endif
+
+#
+# VPopMail Support
+#
+# vpopmail provides easy authentication and
+# multi-domain features. It was originally
+# created for use with Qmail.
+#
+.if WITH_VPOPMAIL
+VPOPMAIL=	${LOCALBASE}/vpopmail/bin/vchkpw
+BUILD_DEPENDS+=	${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
+CONFIGURE_ARGS+=	--with-vpopmail
+.endif
+
 pre-build:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/dovecot-example.conf
@@ -31,11 +57,13 @@ do-install:
 	@${MKDIR} ${PREFIX}/lib/dovecot
 	${INSTALL_PROGRAM} \
 		${WRKSRC}/src/imap/imap \
-		${WRKSRC}/src/auth/imap-auth \
-		${WRKSRC}/src/login/imap-login \
+		${WRKSRC}/src/pop3/pop3 \
+		${WRKSRC}/src/auth/dovecot-auth \
+		${WRKSRC}/src/imap-login/imap-login \
+		${WRKSRC}/src/pop3-login/pop3-login \
 			${PREFIX}/lib/dovecot/
-	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf ${PREFIX}/etc/		
-	${INSTALL_PROGRAM} ${WRKSRC}/src/master/imap-master ${PREFIX}/sbin/
+	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf ${PREFIX}/etc/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/master/dovecot ${PREFIX}/sbin/
 
 post-install:
 	@${MKDIR} /var/dovecot
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
index 33a343ae6fa4..af657360c52b 100644
--- a/mail/dovecot-devel/distinfo
+++ b/mail/dovecot-devel/distinfo
@@ -1 +1 @@
-MD5 (dovecot-0.99.5.tar.gz) = b9e592f23213be9db3603f8bda8235cd
+MD5 (dovecot-0.99.8-test5.tar.gz) = 53708ed6602ff6b572d46b4af55aafa8
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
index b31c37f16458..569318cf52f4 100644
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ b/mail/dovecot-devel/files/patch-dovecot-example.conf
@@ -1,53 +1,80 @@
---- dovecot-example.conf	Thu Jan  2 10:33:53 2003
-+++ dovecot-example.conf.new	Sat Jan  4 21:40:34 2003
-@@ -64,7 +64,7 @@
- ##
+--- dovecot-example.conf	Tue Feb 11 19:35:49 2003
++++ dovecot-example.conf	Thu Feb 13 21:23:56 2003
+@@ -7,7 +7,7 @@
+ # --with-ssldir=/etc/ssl
  
- # Executable location
--#login_executable = /usr/libexec/dovecot/imap-login
-+login_executable = %%PREFIX%%/dovecot/imap-login
- 
- # User to use for imap-login process
- #login_user = imapd
-@@ -76,7 +76,7 @@
- # Directory where imap-auth places authentication UNIX sockets which login
- # needs to be able to connect to. The sockets are created when running as
- # root, so you don't need to give imap-auth any access for it.
+ # Base directory where to store runtime data.
+-#base_dir = /var/run/dovecot/
++base_dir = /var/dovecot/
+ 
+ # Protocols we want to be serving:
+ #  imap imaps pop3 pop3s
+@@ -38,7 +38,7 @@
+ 
+ # SSL parameter file. Master process generates this file for login processes.
+ # It contains Diffie Hellman and RSA parameters.
+-#ssl_parameters_file = /var/run/dovecot/ssl-parameters.dat
++#ssl_parameters_file = /var/dovecot/ssl/parameters.dat
+ 
+ # How often to regenerate the SSL parameters file. Generation is quite CPU
+ # intensive operation. The value is in hours, 0 disables regeneration
+@@ -67,7 +67,7 @@
+ # Directory where authentication process places authentication UNIX sockets
+ # which login needs to be able to connect to. The sockets are created when
+ # running as root, so you don't have to worry about permissions.
 -#login_dir = /var/run/dovecot/login
 +login_dir = /var/dovecot/login
  
- # chroot imap-login process to the login_dir. Only reason not to do this
- # is if you wish to run the whole imapd without roots.
-@@ -111,7 +111,7 @@
+ # chroot login process to the login_dir. Only reason not to do this is if you
+ # wish to run the whole Dovecot without roots.
+@@ -81,7 +81,7 @@
+ login = imap
+ 
+ # Executable location.
+-#login_executable = /usr/libexec/dovecot/imap-login
++login_executable = %%PREFIX%%/lib/dovecot/imap-login
+ 
+ # User to use for the login process. The user must belong to a group where
+ # only it has access, it's used to control access for authentication process
+@@ -126,7 +126,7 @@
+ login = pop3
+ 
+ # Exception to above rule being the executable location.
+-#login_executable = /usr/libexec/dovecot/pop3-login
++login_executable = %%PREFIX%%/lib/dovecot/pop3-login
+ 
+ ##
+ ## Mail processes
+@@ -292,7 +292,7 @@
  ##
  
  # Executable location
 -#imap_executable = /usr/libexec/dovecot/imap
-+imap_executable = %%PREFIX%%/dovecot/imap
++#imap_executable = %%PREFIX%%/lib/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.
-@@ -292,7 +292,7 @@
- auth_userinfo = pam
+@@ -303,7 +303,7 @@
+ ##
  
  # Executable location
--#auth_executable = /usr/libexec/dovecot/imap-auth
-+auth_executable = %%PREFIX%%/dovecot/imap-auth
+-#pop3_executable = /usr/libexec/dovecot/pop3
++#pop3_executable = %%PREFIX%%/lib/dovecot/pop3
  
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -303,7 +303,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.
+@@ -357,7 +357,7 @@
+ auth_passdb = pam
  
- # Directory where to chroot the process. Most authentication backends don't
- # work if this is set, and there's no point chrooting if auth_user is root.
--#auth_chroot = 
-+auth_chroot = /var/dovecot/auth
+ # Executable location
+-#auth_executable = /usr/libexec/dovecot/dovecot-auth
++#auth_executable = %%PREFIX%%/lib/dovecot/dovecot-auth
  
- # Number of authentication processes to create
- #auth_count = 1
-@@ -319,7 +319,7 @@
- #auth_realms = 
- #auth_userinfo = passwd-file /etc/passwd.imap
+ # Set max. process size in megabytes.
+ #auth_process_size = 256
+@@ -388,7 +388,7 @@
+ #auth_userdb = passwd-file /etc/passwd.imap
+ #auth_passdb = passwd-file /etc/passwd.imap
  #auth_user = imapauth
 -#auth_chroot = /var/run/dovecot/auth
 +#auth_chroot = /var/dovecot/auth
diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist
index ad5b3c09681f..02327417f02e 100644
--- a/mail/dovecot-devel/pkg-plist
+++ b/mail/dovecot-devel/pkg-plist
@@ -1,9 +1,11 @@
 etc/dovecot-example.conf
 etc/rc.d/dovecot-imapd.sh
 lib/dovecot/imap
-lib/dovecot/imap-auth
 lib/dovecot/imap-login
-sbin/imap-master
+lib/dovecot/pop3
+lib/dovecot/pop3-login
+lib/dovecot/dovecot-auth
+sbin/dovecot
 %%PORTDOCS%%share/doc/dovecot/auth.txt
 %%PORTDOCS%%share/doc/dovecot/design.txt
 %%PORTDOCS%%share/doc/dovecot/nfs.txt