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/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mail/dovecot/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.32
diff -u -p -r1.14 -r1.32
--- pkgsrc/mail/dovecot/Makefile	2004/02/14 17:21:44	1.14
+++ pkgsrc/mail/dovecot/Makefile	2005/01/23 10:00:12	1.32
@@ -1,58 +1,27 @@
-# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:44 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/01/23 10:00:12 jdolecek Exp $
 
-DISTNAME=		dovecot-0.99.10.4
+DISTNAME=		dovecot-0.99.13
 CATEGORIES=		mail
-MASTER_SITES=		http://dovecot.fi/
-
-PATCH_SITES=		http://www.roughtrade.net/dovecot/
-PATCHFILES=		dovecot-crammd5-0.99.10.2.diff
-PATCH_DIST_STRIP=	-p1
+MASTER_SITES=		http://www.dovecot.org/releases/
 
 MAINTAINER=		tom@replic8.net
-HOMEPAGE=		http://dovecot.fi/
+HOMEPAGE=		http://www.dovecot.org/
 COMMENT=		Secure IMAP and POP3 server
 
-USE_BUILDLINK3=		YES
-USE_LIBTOOL=		YES
-USE_PKGINSTALL= 	YES
-GNU_CONFIGURE=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/.1$//}
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+USE_PKGINSTALL= 	yes
+GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=/var
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
 
 .include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		DOVECOT_USE_GNUTLS 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_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
-
-.if !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-ldap
-.  include "../../databases/openldap/buildlink3.mk"
-.endif
-
-.if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
-.endif
+.include "options.mk"
 
 RCD_SCRIPTS=	dovecot
 
@@ -64,11 +33,14 @@ PKG_USERS=	${DOVECOT_USER}:${DOVECOT_GRO
 EGDIR=		${PREFIX}/share/examples/dovecot
 CONF_FILES=	${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
 
+INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
+			share/examples/dovecot
+
 post-configure:
 	@cd ${WRKSRC};							\
-	for file in dovecot-example.conf; do				\
-		${SED} ${FILES_SUBST_SED} $$file > $$file.new;		\
-		${MV} -f $$file.new $$file;				\
+	for i in dovecot-example.conf; do				\
+		${SED} ${FILES_SUBST_SED} $$i > $$i.new;		\
+		${MV} -f $$i.new $$i;					\
 	done
 
 post-install: