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.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- pkgsrc/mail/dovecot/Attic/Makefile	2003/09/23 14:27:34	1.7
+++ pkgsrc/mail/dovecot/Attic/Makefile	2003/12/09 04:06:37	1.11
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2003/09/23 14:27:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/09 04:06:37 xtraeme Exp $
 #
 
-DISTNAME=		dovecot-0.99.10
-PKGREVISION=		1
+DISTNAME=		dovecot-0.99.10.4
 CATEGORIES=		mail
 MASTER_SITES=		http://dovecot.procontrol.fi/
 
-PATCH_SITES=		${MASTER_SITES}
-PATCHFILES=		auth-home.patch bodystructure.patch
+PATCH_SITES=		http://www.roughtrade.net/dovecot/
+PATCHFILES=		dovecot-crammd5-0.99.10.2.diff
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		tom@replic8.net
@@ -27,20 +26,8 @@ CONFIGURE_ARGS+=	--with-ssldir=${SSLCERT
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-ldap
-.include "../../databases/openldap/buildlink2.mk"
-.endif
-
-.if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.include "../../security/cyrus-sasl2/buildlink2.mk"
-.endif
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-BUILD_DEFS+=		USE_INET6
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
+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
@@ -56,6 +43,20 @@ CPPFLAGS=		-I${BUILDLINK_DIR}/include/pg
 .include "../../databases/postgresql-lib/buildlink2.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/buildlink2.mk"
+.endif
+
+.if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--with-cyrus-sasl2
+.include "../../security/cyrus-sasl2/buildlink2.mk"
+.endif
+
 RCD_SCRIPTS=	dovecot
 
 DOVECOT_USER?=	dovecot