svn commit: r359814 - head/mail/dspam

[Rene Ladan]

Author: rene
Date: Mon Jun 30 09:17:46 2014
New Revision: 359814
URL: http://svnweb.freebsd.org/changeset/ports/359814
QAT: https://qat.redports.org/buildarchive/r359814/

Log:
  mail/dspam: remove support for expired cyrus 2.1 / 2.2
  
  Approved by:	bapt

Modified:
  head/mail/dspam/Makefile

Modified: head/mail/dspam/Makefile
==============================================================================
--- head/mail/dspam/Makefile	Mon Jun 30 09:03:50 2014	(r359813)
+++ head/mail/dspam/Makefile	Mon Jun 30 09:17:46 2014	(r359814)
@@ -29,7 +29,7 @@ OPTIONS_MULTI_DB=	HASH MYSQL MYSQL_COMPR
 			PGSQL PGSQL_LOCAL SQLITE2 SQLITE3
 
 OPTIONS_RADIO=	LDA
-OPTIONS_RADIO_LDA=	CYRUS21 CYRUS22 CYRUS23 CYRUS24 DOVECOT1 \
+OPTIONS_RADIO_LDA=	CYRUS23 CYRUS24 DOVECOT1 \
 		DOVECOT2 EXIM MAILDROP PROCMAIL SAFECAT SENDMAIL
 
 VERBOSE_DEBUG_DESC=	Debug in LOGDIR/dspam.debug
@@ -53,8 +53,6 @@ VIRT_USERS_DESC=	Virtual users (needs SQ
 LONG_USERNAMES_DESC=	Usernames longer that OS supports
 LARGE_SCALE_DESC=	File structure for large scale
 DOMAIN_SCALE_DESC=	File structure for multiple domains
-CYRUS21_DESC=	Cyrus's 2.1 deliver as LDA
-CYRUS22_DESC=	Cyrus's 2.2 deliver as LDA
 CYRUS23_DESC=	Cyrus's 2.3 deliver as LDA
 CYRUS24_DESC=	Cyrus's 2.4 deliver as LDA
 DOVECOT1_DESC=	Dovecot 1.2 deliver as LDA
@@ -296,16 +294,6 @@ CONFIGURE_ARGS+=	--enable-large-scale
 CONFIGURE_ARGS+=	--enable-domain-scale
 .endif
 
-.if ${PORT_OPTIONS:MCYRUS21}
-RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd2
-CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
-.endif
-
-.if ${PORT_OPTIONS:MCYRUS22}
-RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd22
-CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'
-.endif
-
 .if ${PORT_OPTIONS:MCYRUS23}
 RUN_DEPENDS+=	${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd23
 CONFIGURE_ARGS+=	--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver'