Add two patches:

* On some systems, curses.h defines TRUE and FALSE, so conditionalise
  them in lib.h to avoid compiler complaints about duplicate definitions.
* mutt_curses.h refers to event_t from mutt.h, and SHORT_STRING from lib.h,
  so include those headers fom mutt_curses.h.

These patches allow mutt-devel to build on NetBSD-5.99.15.

Bump PKGREVISION to 1.

4 files changed, 44 insertions, 2 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 7a6d5870c72..06e5edcad91 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2009/07/16 20:23:41 tonio Exp $
+# $NetBSD: Makefile,v 1.76 2009/08/10 14:18:12 apb Exp $
 
 DISTNAME=		mutt-1.5.20
+PKGREVISION=		1
 CATEGORIES=		mail
 MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 79ab9e3f743..6a2b844d751 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2009/08/09 20:05:37 tonnerre Exp $
+$NetBSD: distinfo,v 1.62 2009/08/10 14:18:12 apb Exp $
 
 SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31
 RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb
@@ -10,7 +10,9 @@ SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 779037e78738a8dcad5115020e4e9eeb540bbf76
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
+SHA1 (patch-af) = 36ca7b54d42537b1d23d87e58d6e31dbad032c0e
 SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
+SHA1 (patch-ah) = dfe747c30a44bb309cccaca1bd5174fccc3c2bed
 SHA1 (patch-al) = 4de61597f439731e664599b8b0d9f3fe5da557cd
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
 SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98
diff --git a/mail/mutt-devel/patches/patch-af b/mail/mutt-devel/patches/patch-af
new file mode 100644
index 00000000000..01fcbcfc136
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2009/08/10 14:18:12 apb Exp $
+
+On some systems, curses.h defines TRUE and FALSE, so conditionalise
+them here to avoid compiler complaints about duplicate definitions.
+
+--- lib.h.orig	2009-06-01 18:29:32.000000000 +0200
++++ lib.h
+@@ -54,8 +54,12 @@
+ #  define N_(a) a
+ # endif
+ 
+-# define TRUE 1
+-# define FALSE 0
++# ifndef TRUE
++#  define TRUE 1
++# endif
++# ifndef FALSE
++#  define FALSE 0
++# endif
+ 
+ # define HUGE_STRING	5120
+ # define LONG_STRING     1024
diff --git a/mail/mutt-devel/patches/patch-ah b/mail/mutt-devel/patches/patch-ah
new file mode 100644
index 00000000000..32d9d646768
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.3 2009/08/10 14:18:12 apb Exp $
+
+mutt_curses.h refers to event_t from mutt,h, and SHORT_STRING from lib.h,
+so include those headers here.
+
+--- mutt_curses.h.orig	2008-11-11 21:55:47.000000000 +0200
++++ mutt_curses.h
+@@ -52,6 +52,9 @@
+ # include <curses.h>
+ #endif
+ 
++#include "lib.h" /* for SHORT_STRING */
++#include "mutt.h" /* for event_t */
++
+ #define M_ENTER_C '\n'
+ #define M_ENTER_S "\n"
+