Sun Aug 9 20:05:37 2009 UTC ()
Use mutts builtin mutt_curses.h to discover the correct curses header.
Fixes PR 41790.


(tonnerre)
diff -r1.60 -r1.61 pkgsrc/mail/mutt-devel/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/mutt-devel/patches/patch-aq
cvs diff -r1.60 -r1.61 pkgsrc/mail/mutt-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/Attic/distinfo 2009/08/05 11:41:12 1.60
+++ pkgsrc/mail/mutt-devel/Attic/distinfo 2009/08/09 20:05:37 1.61
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.60 2009/08/05 11:41:12 hasso Exp $ 1$NetBSD: distinfo,v 1.61 2009/08/09 20:05:37 tonnerre Exp $
2 2
3SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31 3SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31
4RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb 4RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb
5Size (mutt-1.5.20.tar.gz) = 3635047 bytes 5Size (mutt-1.5.20.tar.gz) = 3635047 bytes
6SHA1 (patch-1.5.20.sidebar.20090619.txt) = d72355e39674bb4f892e4af3b84fe49c94415487 6SHA1 (patch-1.5.20.sidebar.20090619.txt) = d72355e39674bb4f892e4af3b84fe49c94415487
7RMD160 (patch-1.5.20.sidebar.20090619.txt) = 4c693b100a320d11ea94aedb75cff63d9f6cfb3f 7RMD160 (patch-1.5.20.sidebar.20090619.txt) = 4c693b100a320d11ea94aedb75cff63d9f6cfb3f
8Size (patch-1.5.20.sidebar.20090619.txt) = 53335 bytes 8Size (patch-1.5.20.sidebar.20090619.txt) = 53335 bytes
9SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372 9SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
10SHA1 (patch-ab) = 779037e78738a8dcad5115020e4e9eeb540bbf76 10SHA1 (patch-ab) = 779037e78738a8dcad5115020e4e9eeb540bbf76
11SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044 11SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
12SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc 12SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
13SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6 13SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
14SHA1 (patch-al) = 4de61597f439731e664599b8b0d9f3fe5da557cd 14SHA1 (patch-al) = 4de61597f439731e664599b8b0d9f3fe5da557cd
15SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f 15SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
16SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98 16SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98
17SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5 17SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
18SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62 18SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
19SHA1 (patch-aq) = 14178f76748fcc4f9d5f23569a7695454306ec95 19SHA1 (patch-aq) = b26d083f44de7dd641f1176822e4bd943769f35c
cvs diff -r1.3 -r1.4 pkgsrc/mail/mutt-devel/patches/Attic/patch-aq (expand / switch to unified diff)

--- pkgsrc/mail/mutt-devel/patches/Attic/patch-aq 2009/07/25 17:37:04 1.3
+++ pkgsrc/mail/mutt-devel/patches/Attic/patch-aq 2009/08/09 20:05:37 1.4
@@ -1,31 +1,24 @@ @@ -1,31 +1,24 @@
1$NetBSD: patch-aq,v 1.3 2009/07/25 17:37:04 tonnerre Exp $ 1$NetBSD: patch-aq,v 1.4 2009/08/09 20:05:37 tonnerre Exp $
2 2
3--- /dev/null 2009-07-25 19:31:04.000000000 +0200 3--- /dev/null 2009-07-25 19:31:04.000000000 +0200
4+++ mvchgat.c 2009-07-25 19:30:48.000000000 +0200 4+++ mvchgat.c 2009-07-25 19:30:48.000000000 +0200
5@@ -0,0 +1,32 @@ 5@@ -0,0 +1,25 @@
6+#ifdef HAVE_CONFIG_H 6+#ifdef HAVE_CONFIG_H
7+#include "config.h" 7+#include "config.h"
8+#endif 8+#endif
9+ 9+
10+#ifdef HAVE_NCURSESW_NCURSES_H 10+#include "mutt.h"
11+#include <ncursesw/ncurses.h> 11+#include "mutt_curses.h"
12+#endif 
13+#ifdef HAVE_NCURSES_NCURSES_H 
14+#include <ncurses/ncurses.h> 
15+#endif 
16+#ifdef HAVE_NCURSES_H 
17+#include <ncurses.h> 
18+#endif 
19+ 12+
20+#ifndef HAVE_MVWCHGAT 13+#ifndef HAVE_MVWCHGAT
21+int 14+int
22+mvwchgat(WINDOW *win, int y, int x, int count, attr_t attr, short color, 15+mvwchgat(WINDOW *win, int y, int x, int count, attr_t attr, short color,
23+ const void *opts) 16+ const void *opts)
24+{ 17+{
25+ wmove(win, y, x); 18+ wmove(win, y, x);
26+ return wattr_set(win, attr, color, opts); 19+ return wattr_set(win, attr, color, opts);
27+} 20+}
28+#endif 21+#endif
29+ 22+
30+#ifndef HAVE_MVCHGAT 23+#ifndef HAVE_MVCHGAT
31+int 24+int