Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id A1FF97A13C for ; Sat, 8 Oct 2016 14:45:26 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 55F2485EB4; Sat, 8 Oct 2016 14:45:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DACF885E88 for ; Sat, 8 Oct 2016 14:45:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id iZhXZky_7XqX for ; Sat, 8 Oct 2016 14:45:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7E4B085E27 for ; Sat, 8 Oct 2016 14:45:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7C9E0FBD2; Sat, 8 Oct 2016 14:45:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475937925146550" MIME-Version: 1.0 Date: Sat, 8 Oct 2016 14:45:25 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/cad/covered To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20161008144525.7C9E0FBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475937925146550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Sat Oct 8 14:45:25 UTC 2016 Modified Files: pkgsrc/cad/covered: Makefile Log Message: Drop conflict with nonexistent covered-current To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/cad/covered/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475937925146550 Content-Disposition: inline Content-Length: 608 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/cad/covered/Makefile diff -u pkgsrc/cad/covered/Makefile:1.23 pkgsrc/cad/covered/Makefile:1.24 --- pkgsrc/cad/covered/Makefile:1.23 Sat Oct 8 14:38:43 2016 +++ pkgsrc/cad/covered/Makefile Sat Oct 8 14:45:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2016/10/08 14:38:43 kamil Exp $ +# $NetBSD: Makefile,v 1.24 2016/10/08 14:45:25 kamil Exp $ # DISTNAME= covered-0.4.7 @@ -12,8 +12,6 @@ COMMENT= Verilog code coverage analyzer DEPENDS+= verilog-[0-9]*:../../cad/verilog -CONFLICTS+= covered-current-[0-9]* - GNU_CONFIGURE= YES USE_TOOLS+= bison gmake lex --_----------=_1475937925146550--