Received: by mail.netbsd.org (Postfix, from userid 605)
	id 0205984D7D; Tue,  7 Apr 2020 18:04:09 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 7CF6E84DAD
	for <pkgsrc-changes@NetBSD.org>; Tue,  7 Apr 2020 18:04:08 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id c3HJrTWM2ntl for <pkgsrc-changes@netbsd.org>;
	Tue,  7 Apr 2020 18:04:08 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id 053B684D32
	for <pkgsrc-changes@NetBSD.org>; Tue,  7 Apr 2020 18:04:07 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id E81D9FB27; Tue,  7 Apr 2020 18:04:07 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_15862826475670"
MIME-Version: 1.0
Date: Tue, 7 Apr 2020 18:04:07 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/mutt
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
X-Mailer: log_accum
Message-Id: <20200407180407.E81D9FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_15862826475670
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Apr  7 18:04:07 UTC 2020

Modified Files:
	pkgsrc/mail/mutt: Makefile

Log Message:
mutt: remove conflict with neomutt

From Michael-John Turner in PR 55150


To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 pkgsrc/mail/mutt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_15862826475670
Content-Disposition: inline
Content-Length: 676
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/mutt/Makefile
diff -u pkgsrc/mail/mutt/Makefile:1.224 pkgsrc/mail/mutt/Makefile:1.225
--- pkgsrc/mail/mutt/Makefile:1.224	Sun Mar  8 16:50:24 2020
+++ pkgsrc/mail/mutt/Makefile	Tue Apr  7 18:04:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.224 2020/03/08 16:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.225 2020/04/07 18:04:07 wiz Exp $
 
 DISTNAME=		mutt-1.13.4
 PKGREVISION=		1
@@ -13,8 +13,6 @@ LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3 # or 
 BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILD_DEPENDS+=		lynx-[0-9]*:../../www/lynx
 
-CONFLICTS+=		neomutt-[0-9]*
-
 .include "../../mk/bsd.prefs.mk"
 
 USE_PKGLOCALEDIR=	yes


--_----------=_15862826475670--