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 D31EC7A1AF for ; Wed, 21 Sep 2016 12:21:52 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 7A07385EC9; Wed, 21 Sep 2016 12:21:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 09D2384CEF for ; Wed, 21 Sep 2016 12:21:52 +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 6DCFnYRSH-qm for ; Wed, 21 Sep 2016 12:21:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A0D0985EC0 for ; Wed, 21 Sep 2016 12:21:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 98732FBD1; Wed, 21 Sep 2016 12:21:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1474460511274600" MIME-Version: 1.0 Date: Wed, 21 Sep 2016 12:21:51 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/editors/emacs25-nox11 To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20160921122151.98732FBD1@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. --_----------=_1474460511274600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Wed Sep 21 12:21:51 UTC 2016 Modified Files: pkgsrc/editors/emacs25-nox11: Makefile Log Message: Fix CONFLICTS pattern, pointed by @yatasan on twitter To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs25-nox11/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1474460511274600 Content-Disposition: inline Content-Length: 643 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/emacs25-nox11/Makefile diff -u pkgsrc/editors/emacs25-nox11/Makefile:1.1 pkgsrc/editors/emacs25-nox11/Makefile:1.2 --- pkgsrc/editors/emacs25-nox11/Makefile:1.1 Sun Sep 18 13:38:22 2016 +++ pkgsrc/editors/emacs25-nox11/Makefile Wed Sep 21 12:21:51 2016 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2016/09/18 13:38:22 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2016/09/21 12:21:51 ryoon Exp $ PKGNAME= ${DISTNAME:S/emacs/emacs25/:S/-/-nox11-/} -CONFLICTS+= emacs24-[0-9]* +CONFLICTS+= emacs25-[0-9]* FILESDIR= ${.CURDIR}/../../editors/emacs25/files PATCHDIR= ${.CURDIR}/../../editors/emacs25/patches --_----------=_1474460511274600--