[pkgsrc/trunk]: pkgsrc/mail/cyrus-imapd Make this compile on Darwin.

[rh <rh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f578c7f6d06
branches:  trunk
changeset: 494219:4f578c7f6d06
user:      rh <rh%pkgsrc.org@localhost>
date:      Sat May 21 03:31:26 2005 +0000

description:
Make this compile on Darwin.

diffstat:

 mail/cyrus-imapd/distinfo         |   6 +++++-
 mail/cyrus-imapd/patches/patch-aa |  19 +++++++++++++++++++
 mail/cyrus-imapd/patches/patch-ab |  15 +++++++++++++++
 mail/cyrus-imapd/patches/patch-ac |  15 +++++++++++++++
 4 files changed, 54 insertions(+), 1 deletions(-)

diffs (78 lines):

diff -r 01d4a5020b20 -r 4f578c7f6d06 mail/cyrus-imapd/distinfo
--- a/mail/cyrus-imapd/distinfo Sat May 21 03:18:48 2005 +0000
+++ b/mail/cyrus-imapd/distinfo Sat May 21 03:31:26 2005 +0000
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.16 2005/03/02 21:42:48 wiz Exp $
+$NetBSD: distinfo,v 1.17 2005/05/21 03:31:26 rh Exp $
 
 SHA1 (cyrus-imapd-2.2.12.tar.gz) = 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06
 RMD160 (cyrus-imapd-2.2.12.tar.gz) = ff4a95e519ea066ed9b21b515b18bdacaf0d1852
 Size (cyrus-imapd-2.2.12.tar.gz) = 1961161 bytes
+SHA1 (patch-aa) = 6e3349b3d20231022838a1534cade189a8d89586
+SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1
+SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
+SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
 SHA1 (patch-af) = 3bd6217395161e84b0191c24fbe93ad28d6291f0
 SHA1 (patch-al) = 6fa8967eb97f7cfdb93de86a45aa90ab3a1bd129
 SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
diff -r 01d4a5020b20 -r 4f578c7f6d06 mail/cyrus-imapd/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd/patches/patch-aa Sat May 21 03:31:26 2005 +0000
@@ -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 -r 01d4a5020b20 -r 4f578c7f6d06 mail/cyrus-imapd/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd/patches/patch-ab Sat May 21 03:31:26 2005 +0000
@@ -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 -r 01d4a5020b20 -r 4f578c7f6d06 mail/cyrus-imapd/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cyrus-imapd/patches/patch-ac Sat May 21 03:31:26 2005 +0000
@@ -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);
+