4 files changed, 22 insertions, 22 deletions

diff --git a/mail/dovecot-sieve/Makefile b/mail/dovecot-sieve/Makefile
index 6fb15e7cb052..e7fced289b5c 100644
--- a/mail/dovecot-sieve/Makefile
+++ b/mail/dovecot-sieve/Makefile
@@ -6,19 +6,24 @@
 #
 
 PORTNAME=	dovecot-sieve
-PORTVERSION=	1.1.6
+PORTVERSION=	${DOVECOTVERSION}+${DISTVERSION}
+DISTVERSION=	0.1.11
 CATEGORIES=	mail
-MASTER_SITES=	http://www.dovecot.org/releases/sieve/ \
-		http://www.is-root.com/myports/
+MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
+DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	yds@CoolRat.org
 COMMENT=	A Sieve plugin for the Dovecot 'deliver' LDA
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/mail/dovecot:build
-RUN_DEPENDS=	dovecot>=1.1.*:${PORTSDIR}/mail/dovecot
+RUN_DEPENDS=	dovecot>=${DOVECOTVERSION}.*:${PORTSDIR}/mail/dovecot
+
+DOVECOTVERSION=	1.2
 
 USE_LDCONFIG=	${PREFIX}/lib/dovecot/lda
 
+MAN1=	sieve-test.1 sievec.1 sieved.1
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
@@ -26,16 +31,9 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 SUB_FILES=	pkg-message
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS COPYING COPYING.LGPL INSTALL NEWS README \
-		AUTHORS.CMU COPYING.CMU NEWS.CMU README.CMU
+PORTDOCS=	AUTHORS COPYING COPYING.LGPL INSTALL NEWS README TODO
 .endif
 
-post-extract:
-	@${LN} -f ${WRKSRC}/src/libsieve/AUTHORS	${WRKSRC}/AUTHORS.CMU
-	@${LN} -f ${WRKSRC}/src/libsieve/COPYING	${WRKSRC}/COPYING.CMU
-	@${LN} -f ${WRKSRC}/src/libsieve/NEWS		${WRKSRC}/NEWS.CMU
-	@${LN} -f ${WRKSRC}/src/libsieve/README		${WRKSRC}/README.CMU
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} ${_SHROWNGRP} -m ${BINMODE} -d ${DOCSDIR}
diff --git a/mail/dovecot-sieve/distinfo b/mail/dovecot-sieve/distinfo
index fc1335524800..a37cf64f27df 100644
--- a/mail/dovecot-sieve/distinfo
+++ b/mail/dovecot-sieve/distinfo
@@ -1,3 +1,3 @@
-MD5 (dovecot-sieve-1.1.6.tar.gz) = 7acf3d98974a515b868addbdb73054eb
-SHA256 (dovecot-sieve-1.1.6.tar.gz) = a2130a8e7d732bb341a96a96a24b4ddb66834e116573a10c17e68344fe712b36
-SIZE (dovecot-sieve-1.1.6.tar.gz) = 470071
+MD5 (dovecot-1.2-sieve-0.1.11.tar.gz) = c9d8a8668707a831710c7fba06a3bc08
+SHA256 (dovecot-1.2-sieve-0.1.11.tar.gz) = e602cb0d12b8b11c9967cc222954ccea5101eac90d67b2f2a4bfcf1f85fb242a
+SIZE (dovecot-1.2-sieve-0.1.11.tar.gz) = 944964
diff --git a/mail/dovecot-sieve/files/pkg-message.in b/mail/dovecot-sieve/files/pkg-message.in
index 05a7c5ea7b3e..56a888d76286 100644
--- a/mail/dovecot-sieve/files/pkg-message.in
+++ b/mail/dovecot-sieve/files/pkg-message.in
@@ -6,7 +6,9 @@
  You can enable the plugin with this directive in your dovecot.conf:
 
      protocol lda {
-  	mail_plugins = cmusieve
+       # Support for dynamically loadable plugins. mail_plugins is
+       # a space separated list of plugins to load.
+       mail_plugins = sieve # ... other plugins like quota
      }
 
  Further information on configuration can be found at:
diff --git a/mail/dovecot-sieve/pkg-plist b/mail/dovecot-sieve/pkg-plist
index 9c2950ef9812..ad890db34e5c 100644
--- a/mail/dovecot-sieve/pkg-plist
+++ b/mail/dovecot-sieve/pkg-plist
@@ -1,9 +1,9 @@
 @comment $FreeBSD$
-lib/dovecot/lda/lib90_cmusieve_plugin.a
-lib/dovecot/lda/lib90_cmusieve_plugin.la
-lib/dovecot/lda/lib90_cmusieve_plugin.so
-libexec/dovecot/sievec
-libexec/dovecot/sieved
-@dirrmtry libexec/dovecot
+bin/sieve-test
+bin/sievec
+bin/sieved
+lib/dovecot/lda/lib90_sieve_plugin.a
+lib/dovecot/lda/lib90_sieve_plugin.la
+lib/dovecot/lda/lib90_sieve_plugin.so
 @dirrmtry lib/dovecot/lda
 @dirrmtry lib/dovecot