5 files changed, 30 insertions, 22 deletions

diff --git a/mail/dovecot-managesieve/Makefile b/mail/dovecot-managesieve/Makefile
index 4c185172f398..4fd62411d546 100644
--- a/mail/dovecot-managesieve/Makefile
+++ b/mail/dovecot-managesieve/Makefile
@@ -5,20 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	dovecot-1.1-managesieve
+PORTNAME=	dovecot-managesieve
 PORTVERSION=	0.10.3
 CATEGORIES=	mail
-MASTER_SITES=	http://www.rename-it.nl/dovecot/1.1/
+MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
+DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	dgeo@ec-marseille.fr
-COMMENT=	Managesieve package
+COMMENT=	Dovecot ManageSieve Server daemon
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/mail/dovecot:build \
 		${NONEXISTENT}:${PORTSDIR}/mail/dovecot-sieve:build
-RUN_DEPENDS=	${LOCALBASE}/lib/dovecot/lda/lib90_cmusieve_plugin.so:${PORTSDIR}/mail/dovecot-sieve
+RUN_DEPENDS=	dovecot>=1.1.*:${PORTSDIR}/mail/dovecot \
+		dovecot-sieve>=1.1.*:${PORTSDIR}/mail/dovecot-sieve
+
+DOVECOTVERSION=	1.1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-dovecot=`make -C ${PORTSDIR}/mail/dovecot -V WRKSRC` --with-dovecot-sieve=`make -C ${PORTSDIR}/mail/dovecot-sieve -V WRKSRC`
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--with-dovecot=`${MAKE} -C ${PORTSDIR}/mail/dovecot -V WRKSRC` \
+		--with-dovecot-sieve=`${MAKE} -C ${PORTSDIR}/mail/dovecot-sieve -V WRKSRC`
 
 .include <bsd.port.mk>
diff --git a/mail/dovecot-managesieve/distinfo b/mail/dovecot-managesieve/distinfo
index c719646fa62e..d13206a5b79a 100644
--- a/mail/dovecot-managesieve/distinfo
+++ b/mail/dovecot-managesieve/distinfo
@@ -1,3 +1,3 @@
-SIZE (dovecot-1.1-managesieve-0.10.3.tar.gz) = 395123
 MD5 (dovecot-1.1-managesieve-0.10.3.tar.gz) = 14ad3bdec508bad8bcce35b57681d255
 SHA256 (dovecot-1.1-managesieve-0.10.3.tar.gz) = ac70ee48cdec2d472c14cb93bc9f3339a30763e418a579ddea0b9b18befac5ac
+SIZE (dovecot-1.1-managesieve-0.10.3.tar.gz) = 395123
diff --git a/mail/dovecot-managesieve/pkg-descr b/mail/dovecot-managesieve/pkg-descr
index 7a19d5b394f4..8df07d350560 100644
--- a/mail/dovecot-managesieve/pkg-descr
+++ b/mail/dovecot-managesieve/pkg-descr
@@ -1,9 +1,7 @@
-From the Dovecot wiki on LDA (WWW: http://wiki.dovecot.org/LDA/Sieve)
+Dovecot native ManageSieve implementation
 
-Sieve language support by a plugin for the deliver LDA
+Provides ManageSieve protocol service giving users the ability to
+upload their own Sieve scripts to the server, i.e. without the need
+for shell or FTP access.
 
-    * Mail filtering
-    * Mail forwarding
-    * Vacation auto-reply
-
-WWW:	http://www.dovecot.org
+WWW:	http://Wiki.Dovecot.org/ManageSieve
diff --git a/mail/dovecot-managesieve/pkg-message b/mail/dovecot-managesieve/pkg-message
index da9ec298549b..305185d21402 100644
--- a/mail/dovecot-managesieve/pkg-message
+++ b/mail/dovecot-managesieve/pkg-message
@@ -1,16 +1,20 @@
----------------------------------------------------------------------
+----------------------------------------------------------------------
  
- This port assumes you are known with Dovecot and have it installed
- and running on the system you have installed this plugin on.
+ This port assumes you are familiar with Dovecot and have it installed
+ and running on the system you have installed this service on.
 
- You can enable the plugin with this directive in your dovecot.conf:
+ You can enable the service with this directive in your dovecot.conf:
 
-     protocol lda {
-  	mail_plugins = cmusieve
+     protocol managesieve {
+	sieve=~/.dovecot.sieve
+	sieve_storage=~/sieve
      }
 
+ And don't forget to add "managesieve" to the "protocols" setting
+ if you use it. 
+
  Further information on configuration can be found at:
  
-  http://wiki.dovecot.org/
+  http://Wiki.Dovecot.org/ManageSieve
 
----------------------------------------------------------------------
+----------------------------------------------------------------------
diff --git a/mail/dovecot-managesieve/pkg-plist b/mail/dovecot-managesieve/pkg-plist
index 9ddc7c421900..47a319260be3 100644
--- a/mail/dovecot-managesieve/pkg-plist
+++ b/mail/dovecot-managesieve/pkg-plist
@@ -1,4 +1,4 @@
-@comment $ID:$
+@comment $FreeBSD: /tmp/pcvs/ports/mail/dovecot-managesieve/pkg-plist,v 1.2 2008-07-30 02:19:41 beech Exp $
 libexec/dovecot/managesieve
 libexec/dovecot/managesieve-login
 @dirrmtry libexec/dovecot