3 files changed, 49 insertions, 0 deletions
diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa
new file mode 100644
index 00000000000..7465e9e3495
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.4 2005/05/21 03:31:26 rh Exp $
+
+--- tools/config2header.orig	2004-06-23 05:02:31.000000000 +1000
++++ tools/config2header
+@@ -77,6 +77,14 @@ while ($#ARGV >= 0) {
+ 
+ my $use_gcc_extension = ($CC and $CC eq 'gcc');
+ 
++#
++# Skip any CC options such as -pipe
++# The last two parameters are the .c and .h files
++#
++while ($#ARGV > 1) {
++	shift @ARGV;
++}
++
+ die "wrong number of arguments" if ($#ARGV != 1);
+ my ($cfile, $hfile) = @ARGV;
+ 
diff --git a/mail/cyrus-imapd/patches/patch-ab b/mail/cyrus-imapd/patches/patch-ab
new file mode 100644
index 00000000000..5ac87069254
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.4 2005/05/21 03:31:26 rh Exp $
+
+--- sieve/sievec.c.orig	2004-03-12 01:23:20.000000000 +1000
++++ sieve/sievec.c
+@@ -63,6 +63,10 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
++#ifdef __APPLE__
++struct et_list *_et_list = NULL;
++#endif
++
+ /* config.c stuff */
+ const int config_need_data = 0;
+ 
diff --git a/mail/cyrus-imapd/patches/patch-ac b/mail/cyrus-imapd/patches/patch-ac
new file mode 100644
index 00000000000..08272ca1995
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.4 2005/05/21 03:31:26 rh Exp $
+
+--- sieve/sieved.c.orig	2004-06-30 06:05:32.000000000 +1000
++++ sieve/sieved.c
+@@ -42,6 +42,10 @@ OF OR IN CONNECTION WITH THE USE OR PERF
+ 
+ #include "map.h"
+ 
++#ifdef __APPLE__
++struct et_list *_et_list = NULL;
++#endif
++
+ void dump2(bytecode_input_t *d, int len);
+ int dump2_test(bytecode_input_t * d, int i);
+