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.21
retrieving revision 1.29
diff -u -p -r1.21 -r1.29
--- pkgsrc/mail/dovecot/Attic/Makefile	2004/06/21 08:32:05	1.21
+++ pkgsrc/mail/dovecot/Attic/Makefile	2004/12/21 00:00:34	1.29
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.21 2004/06/21 08:32:05 xtraeme Exp $
+# $NetBSD: Makefile,v 1.29 2004/12/21 00:00:34 xtraeme Exp $
 
-DISTNAME=		dovecot-0.99.10.6
+DISTNAME=		dovecot-0.99.12.1
 CATEGORIES=		mail
-MASTER_SITES=		http://dovecot.fi/
+MASTER_SITES=		http://www.dovecot.org/releases/
 
+.if 0
 PATCH_SITES=		http://www.roughtrade.net/dovecot/
-PATCHFILES=		dovecot-crammd5-0.99.10.6.diff
+PATCHFILES=		dovecot-crammd5-0.99.11.diff
 PATCH_DIST_STRIP=	-p1
+.endif
 
 MAINTAINER=		tom@replic8.net
-HOMEPAGE=		http://dovecot.fi/
+HOMEPAGE=		http://www.dovecot.org/
 COMMENT=		Secure IMAP and POP3 server
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/.1$//}
 USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_PKGINSTALL= 	YES
@@ -25,42 +30,7 @@ CONFIGURE_ARGS+=	--with-ssldir=${SSLCERT
 CONFIGURE_ENV+=		F77=${FALSE}
 
 .include "../../mk/bsd.prefs.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
-
-.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
 
@@ -72,11 +42,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: