From 5eb93c1d4d4b86e71aac1c47aa2ae05697b4820e Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Mon, 15 Aug 2005 02:20:33 +0000
Subject: Make this compile with gcc-4.x.

---
 mail/cyrus-imapd/distinfo         |  4 ++--
 mail/cyrus-imapd/patches/patch-aa | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index b849580e9a1..bd57287e85b 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2005/08/08 16:50:59 jlam Exp $
+$NetBSD: distinfo,v 1.20 2005/08/15 02:20:33 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-aa) = 248a84368764d57872425f49a32b33df25c5d17f
 SHA1 (patch-ab) = 986fa32dd6acc088779791b7bdabde5981b61bc1
 SHA1 (patch-ac) = 48557e05ef0d82413da18dd46d9c4baf802a771d
 SHA1 (patch-ad) = e99638a062b2695514c6859788eac3fd02cf5c1d
diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa
index 7465e9e3495..5d8cef338bd 100644
--- a/mail/cyrus-imapd/patches/patch-aa
+++ b/mail/cyrus-imapd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/05/21 03:31:26 rh Exp $
+$NetBSD: patch-aa,v 1.5 2005/08/15 02:20:33 rh Exp $
 
 --- tools/config2header.orig	2004-06-23 05:02:31.000000000 +1000
 +++ tools/config2header
@@ -17,3 +17,21 @@ $NetBSD: patch-aa,v 1.4 2005/05/21 03:31:26 rh Exp $
  die "wrong number of arguments" if ($#ARGV != 1);
  my ($cfile, $hfile) = @ARGV;
  
+@@ -214,7 +222,6 @@ while (<STDIN>) {
+ print HFILE <<EOF
+   IMAPOPT_LAST
+ };
+-extern struct imapopt_s imapopts[];
+ 
+ enum enum_value {
+   IMAP_ENUM_ZERO = 0,
+@@ -260,6 +267,9 @@ print HFILE "    const struct enum_optio
+ 
+ print HFILE <<EOF
+ };
++
++extern struct imapopt_s imapopts[];
++
+ #endif /* INCLUDED_IMAPOPTIONS_H */
+ EOF
+     ;
-- 
cgit v1.2.3