From 3160ca4d1a4e7b555dae127fe42d62f100eff4fd Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Wed, 14 Jan 2004 05:32:27 +0000 Subject: [PATCH] add WITH_IDLE option which takes poll, idled or no. Default is poll as Cyrus IMAPd's default. Requested by: ervin.nemeth@niif.hu --- mail/cyrus-imapd22/Makefile | 14 ++++++++++++++ mail/cyrus-imapd22/files/patch-imap::idled.c | 15 +++++++++++++++ mail/cyrus-imapd22/pkg-plist | 1 + mail/cyrus-imapd23/Makefile | 14 ++++++++++++++ mail/cyrus-imapd23/files/patch-imap::idled.c | 15 +++++++++++++++ mail/cyrus-imapd23/pkg-plist | 1 + mail/cyrus-imapd24/Makefile | 14 ++++++++++++++ mail/cyrus-imapd24/files/patch-imap::idled.c | 15 +++++++++++++++ mail/cyrus-imapd24/pkg-plist | 1 + 9 files changed, 90 insertions(+) create mode 100644 mail/cyrus-imapd22/files/patch-imap::idled.c create mode 100644 mail/cyrus-imapd23/files/patch-imap::idled.c create mode 100644 mail/cyrus-imapd24/files/patch-imap::idled.c diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index ecc001051199..984e0c70b231 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -75,6 +75,20 @@ PLIST_SUB+= MURDER="" PLIST_SUB+= MURDER="@comment " .endif +.if defined(WITH_IDLE) +.if ${WITH_IDLE} != poll && ${WITH_IDLE} != idled && ${WITH_IDLE} != no +BROKEN= "WITH_IDLE must be poll, idled or no" +.endif +CONFIGURE_ARGS+=--with-idle=${WITH_IDLE} +.if ${WITH_IDLE} == idled +PLIST_SUB+= IDLED="" +.else +PLIST_SUB+= IDLED="@comment " +.endif +.else +PLIST_SUB+= IDLED="@comment " +.endif + .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif diff --git a/mail/cyrus-imapd22/files/patch-imap::idled.c b/mail/cyrus-imapd22/files/patch-imap::idled.c new file mode 100644 index 000000000000..f08a8a677048 --- /dev/null +++ b/mail/cyrus-imapd22/files/patch-imap::idled.c @@ -0,0 +1,15 @@ +Index: imap/idled.c +diff -u imap/idled.c.orig imap/idled.c +--- imap/idled.c.orig Thu Oct 23 03:50:07 2003 ++++ imap/idled.c Tue Jan 13 23:17:21 2004 +@@ -409,3 +409,10 @@ + /* never gets here */ + exit(1); + } ++ ++void printstring(const char *s __attribute__((unused))) ++{ ++ /* needed to link against annotate.o */ ++ fatal("printstring() executed, but its not used for IDLED!", ++ EC_SOFTWARE); ++} diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist index e57884517bda..4f1750c38a39 100644 --- a/mail/cyrus-imapd22/pkg-plist +++ b/mail/cyrus-imapd22/pkg-plist @@ -20,6 +20,7 @@ cyrus/bin/cyrquota cyrus/bin/deliver %%NNTP%%cyrus/bin/fetchnews cyrus/bin/fud +%%IDLED%%cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index ecc001051199..984e0c70b231 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -75,6 +75,20 @@ PLIST_SUB+= MURDER="" PLIST_SUB+= MURDER="@comment " .endif +.if defined(WITH_IDLE) +.if ${WITH_IDLE} != poll && ${WITH_IDLE} != idled && ${WITH_IDLE} != no +BROKEN= "WITH_IDLE must be poll, idled or no" +.endif +CONFIGURE_ARGS+=--with-idle=${WITH_IDLE} +.if ${WITH_IDLE} == idled +PLIST_SUB+= IDLED="" +.else +PLIST_SUB+= IDLED="@comment " +.endif +.else +PLIST_SUB+= IDLED="@comment " +.endif + .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif diff --git a/mail/cyrus-imapd23/files/patch-imap::idled.c b/mail/cyrus-imapd23/files/patch-imap::idled.c new file mode 100644 index 000000000000..f08a8a677048 --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-imap::idled.c @@ -0,0 +1,15 @@ +Index: imap/idled.c +diff -u imap/idled.c.orig imap/idled.c +--- imap/idled.c.orig Thu Oct 23 03:50:07 2003 ++++ imap/idled.c Tue Jan 13 23:17:21 2004 +@@ -409,3 +409,10 @@ + /* never gets here */ + exit(1); + } ++ ++void printstring(const char *s __attribute__((unused))) ++{ ++ /* needed to link against annotate.o */ ++ fatal("printstring() executed, but its not used for IDLED!", ++ EC_SOFTWARE); ++} diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist index e57884517bda..4f1750c38a39 100644 --- a/mail/cyrus-imapd23/pkg-plist +++ b/mail/cyrus-imapd23/pkg-plist @@ -20,6 +20,7 @@ cyrus/bin/cyrquota cyrus/bin/deliver %%NNTP%%cyrus/bin/fetchnews cyrus/bin/fud +%%IDLED%%cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index ecc001051199..984e0c70b231 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -75,6 +75,20 @@ PLIST_SUB+= MURDER="" PLIST_SUB+= MURDER="@comment " .endif +.if defined(WITH_IDLE) +.if ${WITH_IDLE} != poll && ${WITH_IDLE} != idled && ${WITH_IDLE} != no +BROKEN= "WITH_IDLE must be poll, idled or no" +.endif +CONFIGURE_ARGS+=--with-idle=${WITH_IDLE} +.if ${WITH_IDLE} == idled +PLIST_SUB+= IDLED="" +.else +PLIST_SUB+= IDLED="@comment " +.endif +.else +PLIST_SUB+= IDLED="@comment " +.endif + .if defined(WITH_LISTEXT) CONFIGURE_ARGS+=--enable-listext .endif diff --git a/mail/cyrus-imapd24/files/patch-imap::idled.c b/mail/cyrus-imapd24/files/patch-imap::idled.c new file mode 100644 index 000000000000..f08a8a677048 --- /dev/null +++ b/mail/cyrus-imapd24/files/patch-imap::idled.c @@ -0,0 +1,15 @@ +Index: imap/idled.c +diff -u imap/idled.c.orig imap/idled.c +--- imap/idled.c.orig Thu Oct 23 03:50:07 2003 ++++ imap/idled.c Tue Jan 13 23:17:21 2004 +@@ -409,3 +409,10 @@ + /* never gets here */ + exit(1); + } ++ ++void printstring(const char *s __attribute__((unused))) ++{ ++ /* needed to link against annotate.o */ ++ fatal("printstring() executed, but its not used for IDLED!", ++ EC_SOFTWARE); ++} diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist index e57884517bda..4f1750c38a39 100644 --- a/mail/cyrus-imapd24/pkg-plist +++ b/mail/cyrus-imapd24/pkg-plist @@ -20,6 +20,7 @@ cyrus/bin/cyrquota cyrus/bin/deliver %%NNTP%%cyrus/bin/fetchnews cyrus/bin/fud +%%IDLED%%cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd