aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2006-02-03 07:24:12 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2006-02-03 07:24:12 +0000
commit717a5a8cc2da6934041dafa6fc0ffcb2b7fcdf27 (patch)
treec67c2daf4268279836aa4076e501cde424f0b84d /mail
parent951f224a6e8d6f4c6b5202838476a0c10d80a504 (diff)
downloadports-717a5a8cc2da6934041dafa6fc0ffcb2b7fcdf27.tar.gz
ports-717a5a8cc2da6934041dafa6fc0ffcb2b7fcdf27.zip
Notes
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd23/Makefile16
-rw-r--r--mail/cyrus-imapd24/Makefile16
2 files changed, 6 insertions, 26 deletions
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 6b88245b489d..065e2ab2b7c8 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -79,8 +79,7 @@ BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43"
.endif
OPTIONS+= DRAC "Enable DRAC support" off
-OPTIONS+= IDLE_IDLED "Enable IMAP IDLE method idled" off \
- IDLE_POLL "Enable IMAP IDLE method idle-polling" on
+OPTIONS+= IDLED "Enable IMAP idled support" off
OPTIONS+= LDAP_PTLOADER "Enable LDAP ptloader" off
OPTIONS+= LISTEXT "Enable IMAP List extensions" off
OPTIONS+= MURDER "Enable IMAP Murder support" off
@@ -149,18 +148,9 @@ PLIST_SUB+= MURDER=""
PLIST_SUB+= MURDER="@comment "
.endif
-.if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL)
-BROKEN= "Multiple IDLE methods selected. Run 'make config' again!"
-.endif
-.if defined(WITH_IDLE_IDLED)
-CONFIGURE_ARGS+=--with-idle=idled
+.if defined(WITH_IDLED)
+CONFIGURE_ARGS+=--enable-idled
PLIST_SUB+= IDLED=""
-.elif defined(WITH_IDLE_POLL)
-CONFIGURE_ARGS+=--with-idle=poll
-PLIST_SUB+= IDLED="@comment "
-.elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL)
-CONFIGURE_ARGS+=--with-idle=no
-PLIST_SUB+= IDLED="@comment "
.else
PLIST_SUB+= IDLED="@comment "
.endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 6b88245b489d..065e2ab2b7c8 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -79,8 +79,7 @@ BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43"
.endif
OPTIONS+= DRAC "Enable DRAC support" off
-OPTIONS+= IDLE_IDLED "Enable IMAP IDLE method idled" off \
- IDLE_POLL "Enable IMAP IDLE method idle-polling" on
+OPTIONS+= IDLED "Enable IMAP idled support" off
OPTIONS+= LDAP_PTLOADER "Enable LDAP ptloader" off
OPTIONS+= LISTEXT "Enable IMAP List extensions" off
OPTIONS+= MURDER "Enable IMAP Murder support" off
@@ -149,18 +148,9 @@ PLIST_SUB+= MURDER=""
PLIST_SUB+= MURDER="@comment "
.endif
-.if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL)
-BROKEN= "Multiple IDLE methods selected. Run 'make config' again!"
-.endif
-.if defined(WITH_IDLE_IDLED)
-CONFIGURE_ARGS+=--with-idle=idled
+.if defined(WITH_IDLED)
+CONFIGURE_ARGS+=--enable-idled
PLIST_SUB+= IDLED=""
-.elif defined(WITH_IDLE_POLL)
-CONFIGURE_ARGS+=--with-idle=poll
-PLIST_SUB+= IDLED="@comment "
-.elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL)
-CONFIGURE_ARGS+=--with-idle=no
-PLIST_SUB+= IDLED="@comment "
.else
PLIST_SUB+= IDLED="@comment "
.endif