Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/postfix/Makefile,v
retrieving revision 1.163
diff -u -r1.163 Makefile
--- Makefile	27 Nov 2010 06:48:50 -0000	1.163
+++ Makefile	24 Dec 2010 15:41:07 -0000
@@ -41,7 +41,8 @@
 
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
-		DOVECOT		"Dovecot SASL authentication method"			off \
+		DOVECOT		"Dovecot 1.x SASL authentication method"		off \
+		DOVECOT2	"Dovecot 2.x SASL authentication method"		off \
 		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
 		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
@@ -122,8 +123,12 @@
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
 
-.if defined(WITH_DOVECOT)
-RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
+.if defined(WITH_DOVECOT) && defined(WITH_DOVECOT2)
+BROKEN=			Select only one Dovecot option
+.endif
+
+.if defined(WITH_DOVECOT) || defined(WITH_DOVECOT2)
+RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot${WITH_DOVECOT2:C/.+/2/}
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 _REQUIRE+=		dovecot
 .endif