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.20
retrieving revision 1.141
diff -u -p -r1.20 -r1.141
--- pkgsrc/mail/dovecot/Attic/Makefile	2004/06/21 08:30:24	1.20
+++ pkgsrc/mail/dovecot/Attic/Makefile	2009/12/11 20:52:21	1.141
@@ -1,89 +1,88 @@
-# $NetBSD: Makefile,v 1.20 2004/06/21 08:30:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.141 2009/12/11 20:52:21 ghen Exp $
 
-DISTNAME=		dovecot-0.99.10.6
+DOVECOT_VERSION=	1.2
+DOVECOT_SUBVERSION=	.8
+SIEVE_VERSION=		0.1.12
+MANAGESIEVE_VERSION=	0.11.9
+DISTNAME=		dovecot-${DOVECOT_VERSION}${DOVECOT_SUBVERSION}
 CATEGORIES=		mail
-MASTER_SITES=		http://dovecot.fi/
+MASTER_SITES=		http://www.dovecot.org/releases/${DOVECOT_VERSION}/
+DOVECOT_SIEVE_SITES=	http://www.rename-it.nl/dovecot/${DOVECOT_VERSION}/
 
-PATCH_SITES=		http://www.roughtrade.net/dovecot/
-PATCHFILES=		dovecot-crammd5-0.99.10.6.diff
-PATCH_DIST_STRIP=	-p1
+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=		tom@replic8.net
-HOMEPAGE=		http://dovecot.fi/
+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
 
-USE_BUILDLINK3=		YES
-USE_LIBTOOL=		YES
-USE_PKGINSTALL= 	YES
-GNU_CONFIGURE=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=/var
-CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config
+USE_TOOLS+=		rpcgen
 
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=		F77=${FALSE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR}
+CONFIGURE_ARGS+=	--enable-header-install
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
-BUILD_DEFS+=		DOVECOT_USE_GNUTLS DOVECOT_USE_MYSQL \
-			DOVECOT_USE_PGSQL USE_INET6 USE_OPENLDAP USE_SASL2
-
-.if !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ssl=gnutls
-.  include "../../security/gnutls/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=        --enable-ssl=openssl
-.  include "../../security/openssl/buildlink3.mk"
-.endif
-
-.if !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][SS])
-CONFIGURE_ARGS+=	--with-mysql
-.  include "../../databases/mysql4-client/buildlink3.mk"
-.endif
-
-.if !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-pgsql
-CPPFLAGS=		-I${BUILDLINK_DIR}/include/pgsql
-.  include "../../databases/postgresql-lib/buildlink3.mk"
-.endif
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
+RCD_SCRIPTS=		dovecot
 
-.if !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-ldap
-.  include "../../databases/openldap/buildlink3.mk"
+DOVECOT_USER?=		dovecot
+DOVECOT_GROUP?=		dovecot
+PKG_GROUPS=		${DOVECOT_GROUP}
+PKG_USERS=		${DOVECOT_USER}:${DOVECOT_GROUP}
+PKG_GROUPS_VARS+=	DOVECOT_GROUP
+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
+
+INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
+			share/examples/dovecot
+
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	dovecot-example.conf
+SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths=	pre-configure
+
+BUILD_DEFS+=		VARBASE
+
+post-build:
+	${SED} "s|/etc/ssl/|${SSLDIR}/|" ${WRKSRC}/dovecot-example.conf \
+						> ${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
 
-.if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
-.endif
-
-RCD_SCRIPTS=	dovecot
-
-DOVECOT_USER?=	dovecot
-DOVECOT_GROUP?=	dovecot
-PKG_GROUPS=	${DOVECOT_GROUP}
-PKG_USERS=	${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\\ IMAP/POP3\\ user
-
-EGDIR=		${PREFIX}/share/examples/dovecot
-CONF_FILES=	${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
-
-post-configure:
-	@cd ${WRKSRC};							\
-	for file in dovecot-example.conf; do				\
-		${SED} ${FILES_SUBST_SED} $$file > $$file.new;		\
-		${MV} -f $$file.new $$file;				\
-	done
-
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf	\
-		${EGDIR}/dovecot.conf.default
-	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${EGDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${DESTDIR}${EGDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/mkcert.sh ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/lib/liblib.a ${DESTDIR}${PREFIX}/lib/dovecot
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"