From 54edc76e7c36ad7ec4e50542b996029af06f5f24 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Mon, 2 May 2016 09:03:13 +0000
Subject: Update "mutt" package to version 1.6.1. Changes since version 1.6.0:
 - Bug fix release. No features were modified or added.

---
 mail/mutt/Makefile                  |  4 ++--
 mail/mutt/distinfo                  | 11 +++++------
 mail/mutt/patches/patch-getdomain.c | 24 ------------------------
 3 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 mail/mutt/patches/patch-getdomain.c

(limited to 'mail/mutt')

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 90503cbe402..3d3f949b7b3 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.177 2016/04/09 08:47:36 tron Exp $
+# $NetBSD: Makefile,v 1.178 2016/05/02 09:03:13 tron Exp $
 
-DISTNAME=		mutt-1.6.0
+DISTNAME=		mutt-1.6.1
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/
 
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index cd1bc9aac8d..58c58819a38 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2016/05/01 04:19:13 richard Exp $
+$NetBSD: distinfo,v 1.43 2016/05/02 09:03:13 tron Exp $
 
-SHA1 (mutt-1.6.0.tar.gz) = bab62759af0873a94dc8b85a62a7a9e09e33c6bb
-RMD160 (mutt-1.6.0.tar.gz) = 1ea7153ef05413d0068b5478acad87927e5cecdb
-SHA512 (mutt-1.6.0.tar.gz) = 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c
-Size (mutt-1.6.0.tar.gz) = 3954591 bytes
+SHA1 (mutt-1.6.1.tar.gz) = ff1c76209a5c299018fc72b9e2e1ab98bf5138dd
+RMD160 (mutt-1.6.1.tar.gz) = 2d9133d233c98b75891a488778c0d498c4827f36
+SHA512 (mutt-1.6.1.tar.gz) = a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5
+Size (mutt-1.6.1.tar.gz) = 3956840 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 7c307068e129eb71ba251d175186dc9c5b171681
 SHA1 (patch-ac) = 40d119b7efed1a4622c42badc9ee97349b504044
@@ -18,4 +18,3 @@ SHA1 (patch-an) = b9cc3e957bb1650c8e22c0edf0ce112f769664a1
 SHA1 (patch-ao) = a5dddb01d30f28337ca825c6461139c2d9f288d5
 SHA1 (patch-ap) = c6f79d5c4e19efdc15e9d5a59934da52b16b7a62
 SHA1 (patch-aq) = e363d8929ced9731a31af1137b111d3476a3d05d
-SHA1 (patch-getdomain.c) = c1db324c49f45f6d6e0d5daca131ecfa7eed405b
diff --git a/mail/mutt/patches/patch-getdomain.c b/mail/mutt/patches/patch-getdomain.c
deleted file mode 100644
index b216eb863cf..00000000000
--- a/mail/mutt/patches/patch-getdomain.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-getdomain.c,v 1.1 2016/05/01 04:19:13 richard Exp $
-
-avoid symbol name clash by mutt with system headers (at least on SunOS)
-
---- getdomain.c.orig	2016-04-02 18:12:22.000000000 +0000
-+++ getdomain.c
-@@ -26,6 +26,17 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- 
-+/* 
-+ * implicit stream.h may define the following symbols also defined
-+ * by mutt without better prefixing
-+ */
-+#ifdef M_CMD
-+#undef M_CMD
-+#endif
-+#ifdef M_READ
-+#undef M_READ
-+#endif
-+
- #include "mutt.h"
- 
- 
-- 
cgit v1.2.3