Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mail/dovecot/Attic/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mail/dovecot/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.126
retrieving revision 1.158
diff -u -p -r1.126 -r1.158
--- pkgsrc/mail/dovecot/Attic/Makefile	2009/01/24 10:51:35	1.126
+++ pkgsrc/mail/dovecot/Attic/Makefile	2011/06/14 09:37:17	1.158
@@ -1,25 +1,34 @@
-# $NetBSD: Makefile,v 1.126 2009/01/24 10:51:35 ghen Exp $
+# $NetBSD: Makefile,v 1.158 2011/06/14 09:37:17 tron Exp $
 
-DISTNAME=		dovecot-1.1.9
+DOVECOT_VERSION=	1.2
+DOVECOT_SUBVERSION=	.17
+SIEVE_VERSION=		0.1.19
+MANAGESIEVE_VERSION=	0.11.13
+DISTNAME=		dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
+PKGREVISION=		2
 CATEGORIES=		mail
-MASTER_SITES=		http://www.dovecot.org/releases/1.1/
+MASTER_SITES=		http://www.dovecot.org/releases/${DOVECOT_VERSION}/
+DOVECOT_SIEVE_SITES=	http://www.rename-it.nl/dovecot/${DOVECOT_VERSION}/
+
+MANAGESIEVE_PATCH=			dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}-managesieve-${MANAGESIEVE_VERSION}.diff.gz
+SITES.${MANAGESIEVE_PATCH}=	${DOVECOT_SIEVE_SITES}
+PATCH_DIST_STRIP.${MANAGESIEVE_PATCH}=	-p1
 
 MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.dovecot.org/
 COMMENT=		Secure IMAP and POP3 server
+LICENSE=		mit AND gnu-lgpl-v2.1 AND modified-bsd
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config rpcgen
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config
-USE_TOOLS+=		rpcgen
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR:Q}
 CONFIGURE_ARGS+=	--enable-header-install
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR}
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -35,8 +44,8 @@ PKG_USERS_VARS+=	DOVECOT_USER
 
 PKG_GECOS.${DOVECOT_USER}=	Dovecot IMAP/POP3 user
 
-EGDIR=			${PREFIX}/share/examples/dovecot
-CONF_FILES=		${EGDIR}/dovecot-example.conf ${PKG_SYSCONFDIR}/dovecot.conf
+EGDIR=		${PREFIX}/share/examples/dovecot
+CONF_FILES=	${EGDIR}/dovecot-example.conf ${PKG_SYSCONFDIR}/dovecot.conf
 
 INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
 			share/examples/dovecot
@@ -53,6 +62,20 @@ post-build:
 						> ${WRKDIR}/dovecot-example.conf
 	${SED} "s|/etc/ssl|${SSLDIR}|" ${WRKSRC}/doc/mkcert.sh \
 						> ${WRKDIR}/mkcert.sh
+.if !empty(PKG_OPTIONS:Mdovecot-sieve)
+# We need dovecot built in order to be able to configure sieve.
+	cd ${WRKSRC.sieve} \
+	&& env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} ${CONFIGURE_ARGS.sieve}
+	cd ${WRKSRC.sieve} \
+	&& env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
+.endif
+.if !empty(PKG_OPTIONS:Mdovecot-managesieve)
+# Wee need sieve built in order to configure and build managesieve. Sigh.
+	cd ${WRKSRC.managesieve} \
+	&& env ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} ${CONFIGURE_ARGS.managesieve}
+	cd ${WRKSRC.managesieve} \
+	&& env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf ${DESTDIR}${EGDIR}