Ensure that we always have a mvchgat at hand. Fixes sidebar patch for

NetBSD < 5.99 and curses != ncurses.

4 files changed, 94 insertions, 12 deletions

diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index fa6c8d0b42c..872529ba064 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2009/07/16 20:23:41 tonio Exp $
+$NetBSD: distinfo,v 1.59 2009/07/25 17:37:03 tonnerre Exp $
 
 SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31
 RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb
@@ -7,11 +7,12 @@ SHA1 (patch-1.5.20.sidebar.20090619.txt) = d72355e39674bb4f892e4af3b84fe49c94415
 RMD160 (patch-1.5.20.sidebar.20090619.txt) = 4c693b100a320d11ea94aedb75cff63d9f6cfb3f
 Size (patch-1.5.20.sidebar.20090619.txt) = 53335 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
-SHA1 (patch-ab) = 39a3cbe6e1738e036cb679a22c7385ed5ac401eb
+SHA1 (patch-ab) = e7aa6f36a1b8b81bb98d8901afbf7ecc75c1b841
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
-SHA1 (patch-al) = ac8d963286d9edee73ee00bdb8f4ffcd65c6cd5d
+SHA1 (patch-al) = 8f3f31b418c7ff2962cc20197b4cda875e3dd371
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
 SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98
 SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
 SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
+SHA1 (patch-aq) = 14178f76748fcc4f9d5f23569a7695454306ec95
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
index d6cf0ef69fa..b3208171d20 100644
--- a/mail/mutt-devel/patches/patch-ab
+++ b/mail/mutt-devel/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.12 2009/01/27 19:50:33 tonio Exp $
+$NetBSD: patch-ab,v 1.13 2009/07/25 17:37:04 tonnerre Exp $
 
---- Makefile.in.orig	2009-01-05 20:24:13.000000000 +0100
+--- Makefile.in.orig	2009-07-25 19:16:56.000000000 +0200
 +++ Makefile.in
-@@ -163,7 +163,7 @@ DATADIRNAME = @DATADIRNAME@
+@@ -65,7 +65,7 @@ CONFIG_CLEAN_FILES = intl/Makefile hcach
+ CONFIG_CLEAN_VPATH_FILES =
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+-am_mutt_OBJECTS = addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
++am_mutt_OBJECTS = mvchgat.$(OBJEXT) addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
+ 	base64.$(OBJEXT) browser.$(OBJEXT) buffy.$(OBJEXT) \
+ 	color.$(OBJEXT) crypt.$(OBJEXT) cryptglue.$(OBJEXT) \
+ 	commands.$(OBJEXT) complete.$(OBJEXT) compose.$(OBJEXT) \
+@@ -215,7 +215,7 @@ DATADIRNAME = @DATADIRNAME@
  DBX = @DBX@
  DEBUGGER = @DEBUGGER@
  DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -11,16 +20,33 @@ $NetBSD: patch-ab,v 1.12 2009/01/27 19:50:33 tonio Exp $
  	-DHAVE_CONFIG_H=1
  
  DEPDIR = @DEPDIR@
-@@ -272,7 +272,7 @@ infodir = @infodir@
+@@ -321,7 +321,7 @@ infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
 -localedir = @localedir@
-+localedir = $(prefix)/share/locale
++localedir = /usr/pkg/share/locale
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -1063,11 +1063,6 @@ install-exec-hook:
+@@ -344,7 +344,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
+ SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
+-mutt_SOURCES = \
++mutt_SOURCES = mvchgat.c \
+ 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
+ 	crypt.c cryptglue.c \
+ 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
+@@ -665,6 +665,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc2231.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc3676.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfc822.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mvchgat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/score.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@
+@@ -1191,11 +1192,6 @@ install-exec-hook:
  		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
  		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
  	fi
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
index ce538609a67..ff41913d067 100644
--- a/mail/mutt-devel/patches/patch-al
+++ b/mail/mutt-devel/patches/patch-al
@@ -1,8 +1,17 @@
-$NetBSD: patch-al,v 1.8 2007/11/07 21:19:38 tonio Exp $
+$NetBSD: patch-al,v 1.9 2009/07/25 17:37:04 tonnerre Exp $
 
---- configure.orig	Thu Nov  1 20:13:15 2007
+--- configure.orig	2009-06-09 08:50:42.000000000 +0200
 +++ configure
-@@ -13234,7 +13234,7 @@ docdir=$mutt_cv_docdir
+@@ -11623,7 +11623,7 @@ fi
+ 
+         old_LIBS="$LIBS"
+         LIBS="$LIBS $MUTTLIBS"
+-        for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm
++        for ac_func in start_color typeahead bkgdset curs_set meta use_default_colors resizeterm mvchgat mvwchgat
+ do
+ 
+ { $as_echo "$as_me:$LINENO: checking for $ac_func declaration" >&5
+@@ -14939,7 +14939,7 @@ docdir=$mutt_cv_docdir
  
  if test x$mutt_cv_setgid = xyes; then
          DOTLOCK_GROUP='mail'
@@ -11,3 +20,12 @@ $NetBSD: patch-al,v 1.8 2007/11/07 21:19:38 tonio Exp $
  else
          DOTLOCK_GROUP=''
          DOTLOCK_PERMISSION=755
+@@ -22796,6 +22796,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
diff --git a/mail/mutt-devel/patches/patch-aq b/mail/mutt-devel/patches/patch-aq
new file mode 100644
index 00000000000..ba282ae62f8
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-aq
@@ -0,0 +1,37 @@
+$NetBSD: patch-aq,v 1.3 2009/07/25 17:37:04 tonnerre Exp $
+
+--- /dev/null	2009-07-25 19:31:04.000000000 +0200
++++ mvchgat.c	2009-07-25 19:30:48.000000000 +0200
+@@ -0,0 +1,32 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#ifdef HAVE_NCURSESW_NCURSES_H
++#include <ncursesw/ncurses.h>
++#endif
++#ifdef HAVE_NCURSES_NCURSES_H
++#include <ncurses/ncurses.h>
++#endif
++#ifdef HAVE_NCURSES_H
++#include <ncurses.h>
++#endif
++
++#ifndef HAVE_MVWCHGAT
++int
++mvwchgat(WINDOW *win, int y, int x, int count, attr_t attr, short color,
++	const void *opts)
++{
++	wmove(win, y, x);
++	return wattr_set(win, attr, color, opts);
++}
++#endif
++
++#ifndef HAVE_MVCHGAT
++int
++mvchgat(int y, int x, int count, attr_t attr, short color,
++	const void *opts)
++{
++	return mvwchgat(stdscr, y, x, count, attr, color, opts);
++}
++#endif