Fix breakages introduced with previous commit.

4 files changed, 24 insertions, 15 deletions

diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 872529ba064..458024a819a 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2009/07/25 17:37:03 tonnerre Exp $
+$NetBSD: distinfo,v 1.60 2009/08/05 11:41:12 hasso Exp $
 
 SHA1 (mutt-1.5.20.tar.gz) = d2bec7a33771f128ca49b1723b06b6d248a35d31
 RMD160 (mutt-1.5.20.tar.gz) = df582f79364b9fd70a0001e76a119d8f78275ebb
@@ -7,10 +7,11 @@ 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) = e7aa6f36a1b8b81bb98d8901afbf7ecc75c1b841
+SHA1 (patch-ab) = 779037e78738a8dcad5115020e4e9eeb540bbf76
+SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ag) = 2b76839be18271a72cb9e407f54879736f2a7ad6
-SHA1 (patch-al) = 8f3f31b418c7ff2962cc20197b4cda875e3dd371
+SHA1 (patch-al) = 4de61597f439731e664599b8b0d9f3fe5da557cd
 SHA1 (patch-am) = f7f20860bccb63ed5464e3a1225719ffc3fa504f
 SHA1 (patch-an) = eae26290a7a03b3ba31d058cd154c4de8effcf98
 SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
index b3208171d20..ea2abeba8fc 100644
--- a/mail/mutt-devel/patches/patch-ab
+++ b/mail/mutt-devel/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.13 2009/07/25 17:37:04 tonnerre Exp $
+$NetBSD: patch-ab,v 1.14 2009/08/05 11:41:12 hasso Exp $
 
 --- Makefile.in.orig	2009-07-25 19:16:56.000000000 +0200
 +++ Makefile.in
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.13 2009/07/25 17:37:04 tonnerre Exp $
  libdir = @libdir@
  libexecdir = @libexecdir@
 -localedir = @localedir@
-+localedir = /usr/pkg/share/locale
++localedir = $(prefix)/share/locale
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
new file mode 100644
index 00000000000..d0ff4fafdcf
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.8 2009/08/05 11:41:12 hasso Exp $
+
+--- config.h.in.orig	2009-08-02 09:34:54 +0300
++++ config.h.in	2009-08-02 09:36:37 +0300
+@@ -442,6 +442,12 @@
+ /* Define to 1 if you have the `__argz_stringify' function. */
+ #undef HAVE___ARGZ_STRINGIFY
+ 
++/* Define to 1 if you have the `mvchgat' function. */
++#undef HAVE_MVCHGAT
++
++/* Define to 1 if you have the `mvwchgat' function. */
++#undef HAVE_MVWCHGAT
++
+ /* Is mail spooled to the user's home directory? If defined, MAILPATH should
+    be set to the filename of the spool mailbox relative the the home
+    directory. use: configure --with-homespool=FILE */
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
index ff41913d067..63913bd8597 100644
--- a/mail/mutt-devel/patches/patch-al
+++ b/mail/mutt-devel/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.9 2009/07/25 17:37:04 tonnerre Exp $
+$NetBSD: patch-al,v 1.10 2009/08/05 11:41:12 hasso Exp $
 
 --- configure.orig	2009-06-09 08:50:42.000000000 +0200
 +++ configure
@@ -20,12 +20,3 @@ $NetBSD: patch-al,v 1.9 2009/07/25 17:37:04 tonnerre 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 ;;